Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge remote-tracking branch 'origin/master'
[simgrid.git] / src / smpi / smpi_mpi_dt.c
index 4961520..b332061 100644 (file)
@@ -5,7 +5,7 @@
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
 * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
 #include <stdlib.h>
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi,
                                 "Logging specific to SMPI (datatype)");
 
-typedef struct s_smpi_mpi_datatype {
-  size_t size;
-  size_t contiguous;
-  size_t block_stride;
-  size_t block_length;
-  size_t block_count:
-  MPI_Aint lb;
-  MPI_Aint ub;
-  int flags;
-} s_smpi_mpi_datatype_t;
-
 #define CREATE_MPI_DATATYPE(name, type)       \
   static s_smpi_mpi_datatype_t mpi_##name = { \
     sizeof(type),  /* size */                 \
-    1,             /*contiguous*/             \
-    0,             /*block_stride*/           \
-    0,             /*block_length*/           \
-    0,             /*block_count*/            \
+    0,             /*was 1 has_subtype*/             \
     0,             /* lb */                   \
     sizeof(type),  /* ub = lb + size */       \
-    DT_FLAG_BASIC  /* flags */                \
+    DT_FLAG_BASIC,  /* flags */              \
+    NULL           /* pointer on extended struct*/ \
   };                                          \
-  MPI_Datatype name = &mpi_##name;
+MPI_Datatype name = &mpi_##name;
 
 
 //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC.
@@ -115,23 +102,7 @@ size_t smpi_datatype_size(MPI_Datatype datatype)
   return datatype->size;
 }
 
-size_t smpi_datatype_contiguous(MPI_Datatype datatype)
-{
-  return datatype->contiguous;
-}
 
-size_t smpi_datatype_block_stride(MPI_Datatype datatype)
-{
-  return datatype->block_stride;
-}
-size_t smpi_datatype_block_length(MPI_Datatype datatype)
-{
-  return datatype->block_length;
-}
-size_t smpi_datatype_block_count(MPI_Datatype datatype)
-{
-  return datatype->block_count;
-}
 
 MPI_Aint smpi_datatype_lb(MPI_Datatype datatype)
 {
@@ -171,18 +142,126 @@ int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     sendcount *= smpi_datatype_size(sendtype);
     recvcount *= smpi_datatype_size(recvtype);
     count = sendcount < recvcount ? sendcount : recvcount;
-    memcpy(recvbuf, sendbuf, count);
+
+    if(sendtype->has_subtype == 0 && recvtype->has_subtype == 0) {
+      memcpy(recvbuf, sendbuf, count);
+    }
+    else if (sendtype->has_subtype == 0)
+    {
+      s_smpi_subtype_t *subtype =  recvtype->substruct;
+      subtype->unserialize( sendbuf, recvbuf,1, subtype);
+    }
+    else if (recvtype->has_subtype == 0)
+    {
+      s_smpi_subtype_t *subtype =  sendtype->substruct;
+      subtype->serialize(sendbuf, recvbuf,1, subtype);
+    }else{
+      s_smpi_subtype_t *subtype =  sendtype->substruct;
+
+      s_smpi_mpi_vector_t* type_c = (s_smpi_mpi_vector_t*)sendtype;
+
+      void * buf_tmp = malloc(count * type_c->size_oldtype);
+
+      subtype->serialize( sendbuf, buf_tmp,1, subtype);
+      subtype =  recvtype->substruct;
+      subtype->unserialize(recvbuf, buf_tmp,1, subtype);
+
+      free(buf_tmp);
+    }
     retval = sendcount > recvcount ? MPI_ERR_TRUNCATE : MPI_SUCCESS;
   }
+
   return retval;
 }
 
-void smpi_datatype_create(MPI_Datatype* new_type, int size, int flags){
+/*
+ *  Copies noncontiguous data into contiguous memory.
+ *  @param contiguous_vector - output vector
+ *  @param noncontiguous_vector - input vector
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void serialize_vector( const void *noncontiguous_vector,
+                       void *contiguous_vector,
+                       size_t count,
+                       void *type)
+{
+  s_smpi_mpi_vector_t* type_c = (s_smpi_mpi_vector_t*)type;
+  int i;
+  char* contiguous_vector_char = (char*)contiguous_vector;
+  char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(contiguous_vector_char,
+           noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+
+    contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+    noncontiguous_vector_char += type_c->block_stride*type_c->size_oldtype;
+  }
+}
+
+/*
+ *  Copies contiguous data into noncontiguous memory.
+ *  @param noncontiguous_vector - output vector
+ *  @param contiguous_vector - input vector
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void unserialize_vector( const void *contiguous_vector,
+                         void *noncontiguous_vector,
+                         size_t count,
+                         void *type)
+{
+  s_smpi_mpi_vector_t* type_c = (s_smpi_mpi_vector_t*)type;
+  int i;
+
+  char* contiguous_vector_char = (char*)contiguous_vector;
+  char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(noncontiguous_vector_char,
+           contiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+
+    contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+    noncontiguous_vector_char += type_c->block_stride*type_c->size_oldtype;
+  }
+}
+
+/*
+ * Create a Sub type vector to be able to serialize and unserialize it
+ * the structre s_smpi_mpi_vector_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ *
+ */
+s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride,
+                                                  int block_length,
+                                                  int block_count,
+                                                  MPI_Datatype old_type,
+                                                  int size_oldtype){
+  s_smpi_mpi_vector_t *new_t= xbt_new(s_smpi_mpi_vector_t,1);
+  new_t->base.serialize = &serialize_vector;
+  new_t->base.unserialize = &unserialize_vector;
+  new_t->block_stride = block_stride;
+  new_t->block_length = block_length;
+  new_t->block_count = block_count;
+  new_t->old_type = old_type;
+  new_t->size_oldtype = size_oldtype;
+  return new_t;
+}
+
+void smpi_datatype_create(MPI_Datatype* new_type, int size, int has_subtype,
+                          void *struct_type, int flags){
   MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
-  new_t->size=size;
-  new_t->lb=0;
-  new_t->ub=size;
-  new_t->flags=flags;
+  new_t->size = size;
+  new_t->has_subtype = has_subtype;
+  new_t->lb = 0;
+  new_t->ub = size;
+  new_t->flags = flags;
+  new_t->substruct = struct_type;
   *new_type = new_t;
 }
 
@@ -194,9 +273,10 @@ int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new
 {
   int retval;
   if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
-     retval = MPI_ERR_TYPE;
+    retval = MPI_ERR_TYPE;
   } else {
-    smpi_datatype_create(new_type, count * smpi_datatype_size(old_type), DT_FLAG_CONTIGUOUS);
+    smpi_datatype_create(new_type, count *
+                         smpi_datatype_size(old_type),1,NULL, DT_FLAG_CONTIGUOUS);
     retval=MPI_SUCCESS;
   }
   return retval;
@@ -205,80 +285,480 @@ int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new
 int smpi_datatype_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type)
 {
   int retval;
-  if (blocklen<=0)return MPI_ERR_ARG;
+  if (blocklen<=0) return MPI_ERR_ARG;
   if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
-     retval = MPI_ERR_TYPE;
+    retval = MPI_ERR_TYPE;
   } else {
-    smpi_datatype_create(new_type, count * (blocklen+stride) * smpi_datatype_size(old_type), DT_FLAG_VECTOR);
-    retval=MPI_SUCCESS;
+    if(stride != blocklen){
+      s_smpi_mpi_vector_t* subtype = smpi_datatype_vector_create( stride,
+                                                                  blocklen,
+                                                                  count,
+                                                                  old_type,
+                                                                  smpi_datatype_size(old_type));
+
+      smpi_datatype_create(new_type, count * (blocklen) *
+                           smpi_datatype_size(old_type),
+                           1,
+                           subtype,
+                           DT_FLAG_VECTOR);
+      retval=MPI_SUCCESS;
+    }else{
+      /* in this situation the data are contignous thus it's not
+       * required to serialize and unserialize it*/
+      smpi_datatype_create(new_type, count * blocklen *
+                           smpi_datatype_size(old_type),
+                           0,
+                           NULL,
+                           DT_FLAG_VECTOR);
+      retval=MPI_SUCCESS;
+    }
   }
   return retval;
 }
 
+
+
+/*
+Hvector Implementation - Vector with stride in bytes
+*/
+
+
+/*
+ *  Copies noncontiguous data into contiguous memory.
+ *  @param contiguous_hvector - output hvector
+ *  @param noncontiguous_hvector - input hvector
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data, in bytes
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void serialize_hvector( const void *noncontiguous_hvector,
+                       void *contiguous_hvector,
+                       size_t count,
+                       void *type)
+{
+  s_smpi_mpi_hvector_t* type_c = (s_smpi_mpi_hvector_t*)type;
+  int i;
+  char* contiguous_vector_char = (char*)contiguous_hvector;
+  char* noncontiguous_vector_char = (char*)noncontiguous_hvector;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(contiguous_vector_char,
+           noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+
+    contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+    noncontiguous_vector_char += type_c->block_stride;
+  }
+}
+/*
+ *  Copies contiguous data into noncontiguous memory.
+ *  @param noncontiguous_vector - output hvector
+ *  @param contiguous_vector - input hvector
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data, in bytes
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void unserialize_hvector( const void *contiguous_vector,
+                         void *noncontiguous_vector,
+                         size_t count,
+                         void *type)
+{
+  s_smpi_mpi_hvector_t* type_c = (s_smpi_mpi_hvector_t*)type;
+  int i;
+
+  char* contiguous_vector_char = (char*)contiguous_vector;
+  char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(noncontiguous_vector_char,
+           contiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+
+    contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+    noncontiguous_vector_char += type_c->block_stride;
+  }
+}
+
+/*
+ * Create a Sub type vector to be able to serialize and unserialize it
+ * the structre s_smpi_mpi_vector_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ *
+ */
+s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride,
+                                                  int block_length,
+                                                  int block_count,
+                                                  MPI_Datatype old_type,
+                                                  int size_oldtype){
+  s_smpi_mpi_hvector_t *new_t= xbt_new(s_smpi_mpi_hvector_t,1);
+  new_t->base.serialize = &serialize_hvector;
+  new_t->base.unserialize = &unserialize_hvector;
+  new_t->block_stride = block_stride;
+  new_t->block_length = block_length;
+  new_t->block_count = block_count;
+  new_t->old_type = old_type;
+  new_t->size_oldtype = size_oldtype;
+  return new_t;
+}
+
 int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type)
 {
   int retval;
-  if (blocklen<=0)return MPI_ERR_ARG;
+  if (blocklen<=0) return MPI_ERR_ARG;
   if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
-     retval = MPI_ERR_TYPE;
+    retval = MPI_ERR_TYPE;
   } else {
-    smpi_datatype_create(new_type, count * ((blocklen * smpi_datatype_size(old_type))+stride), DT_FLAG_VECTOR);
-    retval=MPI_SUCCESS;
+    if(stride != blocklen*smpi_datatype_size(old_type)){
+      s_smpi_mpi_hvector_t* subtype = smpi_datatype_hvector_create( stride,
+                                                                    blocklen,
+                                                                    count,
+                                                                    old_type,
+                                                                    smpi_datatype_size(old_type));
+
+      smpi_datatype_create(new_type, count * blocklen *
+                           smpi_datatype_size(old_type),
+                           1,
+                           subtype,
+                           DT_FLAG_VECTOR);
+      retval=MPI_SUCCESS;
+    }else{
+      smpi_datatype_create(new_type, count * blocklen *
+                                               smpi_datatype_size(old_type),
+                                              0,
+                                              NULL,
+                                              DT_FLAG_VECTOR);
+      retval=MPI_SUCCESS;
+    }
   }
   return retval;
 }
 
 
+/*
+Indexed Implementation
+*/
+
+/*
+ *  Copies noncontiguous data into contiguous memory.
+ *  @param contiguous_indexed - output indexed
+ *  @param noncontiguous_indexed - input indexed
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void serialize_indexed( const void *noncontiguous_indexed,
+                       void *contiguous_indexed,
+                       size_t count,
+                       void *type)
+{
+  s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
+  int i;
+  char* contiguous_indexed_char = (char*)contiguous_indexed;
+  char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(contiguous_indexed_char,
+           noncontiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+
+    contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
+    noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*type_c->size_oldtype;
+  }
+}
+/*
+ *  Copies contiguous data into noncontiguous memory.
+ *  @param noncontiguous_indexed - output indexed
+ *  @param contiguous_indexed - input indexed
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void unserialize_indexed( const void *contiguous_indexed,
+                         void *noncontiguous_indexed,
+                         size_t count,
+                         void *type)
+{
+  s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
+  int i;
+
+  char* contiguous_indexed_char = (char*)contiguous_indexed;
+  char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(noncontiguous_indexed_char,
+           contiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+
+    contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
+    noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*type_c->size_oldtype;
+  }
+}
+
+/*
+ * Create a Sub type indexed to be able to serialize and unserialize it
+ * the structre s_smpi_mpi_indexed_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ */
+s_smpi_mpi_indexed_t* smpi_datatype_indexed_create( int* block_lengths,
+                                                  int* block_indices,
+                                                  int block_count,
+                                                  MPI_Datatype old_type,
+                                                  int size_oldtype){
+  s_smpi_mpi_indexed_t *new_t= xbt_new(s_smpi_mpi_indexed_t,1);
+  new_t->base.serialize = &serialize_indexed;
+  new_t->base.unserialize = &unserialize_indexed;
+ //FIXME : copy those or assume they won't be freed ? 
+  new_t->block_lengths = block_lengths;
+  new_t->block_indices = block_indices;
+  new_t->block_count = block_count;
+  new_t->old_type = old_type;
+  new_t->size_oldtype = size_oldtype;
+  return new_t;
+}
+
+
 int smpi_datatype_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type)
 {
   int i;
   int retval;
+  int size = 0;
   for(i=0; i< count; i++){
     if   (blocklens[i]<=0)
       return MPI_ERR_ARG;
+    size += blocklens[i];
   }
   if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
-     retval = MPI_ERR_TYPE;
+    retval = MPI_ERR_TYPE;
   } else {
-    smpi_datatype_create(new_type,  (blocklens[count-1] + indices[count-1]) * smpi_datatype_size(old_type), DT_FLAG_DATA);
+    s_smpi_mpi_indexed_t* subtype = smpi_datatype_indexed_create( blocklens,
+                                                                  indices,
+                                                                  count,
+                                                                  old_type,
+                                                                  smpi_datatype_size(old_type));
+
+    smpi_datatype_create(new_type,  size *
+                         smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA);
     retval=MPI_SUCCESS;
   }
   return retval;
 }
 
+
+/*
+Hindexed Implementation - Indexed with indices in bytes 
+*/
+
+/*
+ *  Copies noncontiguous data into contiguous memory.
+ *  @param contiguous_hindexed - output hindexed
+ *  @param noncontiguous_hindexed - input hindexed
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void serialize_hindexed( const void *noncontiguous_hindexed,
+                       void *contiguous_hindexed,
+                       size_t count,
+                       void *type)
+{
+  s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type;
+  int i;
+  char* contiguous_hindexed_char = (char*)contiguous_hindexed;
+  char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(contiguous_hindexed_char,
+           noncontiguous_hindexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+
+    contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
+    noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1];
+  }
+}
+/*
+ *  Copies contiguous data into noncontiguous memory.
+ *  @param noncontiguous_hindexed - output hindexed
+ *  @param contiguous_hindexed - input hindexed
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void unserialize_hindexed( const void *contiguous_hindexed,
+                         void *noncontiguous_hindexed,
+                         size_t count,
+                         void *type)
+{
+  s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type;
+  int i;
+
+  char* contiguous_hindexed_char = (char*)contiguous_hindexed;
+  char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(noncontiguous_hindexed_char,
+           contiguous_hindexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+
+    contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
+    noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1];
+  }
+}
+
+/*
+ * Create a Sub type hindexed to be able to serialize and unserialize it
+ * the structre s_smpi_mpi_hindexed_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ */
+s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create( int* block_lengths,
+                                                  MPI_Aint* block_indices,
+                                                  int block_count,
+                                                  MPI_Datatype old_type,
+                                                  int size_oldtype){
+  s_smpi_mpi_hindexed_t *new_t= xbt_new(s_smpi_mpi_hindexed_t,1);
+  new_t->base.serialize = &serialize_hindexed;
+  new_t->base.unserialize = &unserialize_hindexed;
+ //FIXME : copy those or assume they won't be freed ? 
+  new_t->block_lengths = block_lengths;
+  new_t->block_indices = block_indices;
+  new_t->block_count = block_count;
+  new_t->old_type = old_type;
+  new_t->size_oldtype = size_oldtype;
+  return new_t;
+}
+
+
 int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type)
 {
   int i;
   int retval;
+  int size = 0;
   for(i=0; i< count; i++){
     if   (blocklens[i]<=0)
       return MPI_ERR_ARG;
+    size += blocklens[i];
   }
   if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
-     retval = MPI_ERR_TYPE;
+    retval = MPI_ERR_TYPE;
   } else {
-    smpi_datatype_create(new_type,indices[count-1] + (blocklens[count-1]  * smpi_datatype_size(old_type)), DT_FLAG_DATA);
+    s_smpi_mpi_hindexed_t* subtype = smpi_datatype_hindexed_create( blocklens,
+                                                                  indices,
+                                                                  count,
+                                                                  old_type,
+                                                                  smpi_datatype_size(old_type));
+
+    smpi_datatype_create(new_type,  size *
+                         smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA);
     retval=MPI_SUCCESS;
   }
   return retval;
 }
 
+
+/*
+struct Implementation - Indexed with indices in bytes 
+*/
+
+/*
+ *  Copies noncontiguous data into contiguous memory.
+ *  @param contiguous_struct - output struct
+ *  @param noncontiguous_struct - input struct
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void serialize_struct( const void *noncontiguous_struct,
+                       void *contiguous_struct,
+                       size_t count,
+                       void *type)
+{
+  s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type;
+  int i;
+  char* contiguous_struct_char = (char*)contiguous_struct;
+  char* noncontiguous_struct_char = (char*)noncontiguous_struct;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(contiguous_struct_char,
+           noncontiguous_struct_char, type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));
+    contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);
+    noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1];
+  }
+}
+/*
+ *  Copies contiguous data into noncontiguous memory.
+ *  @param noncontiguous_struct - output struct
+ *  @param contiguous_struct - input struct
+ *  @param type - pointer contening :
+ *      - stride - stride of between noncontiguous data
+ *      - block_length - the width or height of blocked matrix
+ *      - count - the number of rows of matrix
+ */
+void unserialize_struct( const void *contiguous_struct,
+                         void *noncontiguous_struct,
+                         size_t count,
+                         void *type)
+{
+  s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type;
+  int i;
+
+  char* contiguous_struct_char = (char*)contiguous_struct;
+  char* noncontiguous_struct_char = (char*)noncontiguous_struct;
+
+  for (i = 0; i < type_c->block_count * count; i++) {
+    memcpy(noncontiguous_struct_char,
+           contiguous_struct_char, type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));
+    contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);
+    noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1];
+  }
+}
+
+/*
+ * Create a Sub type struct to be able to serialize and unserialize it
+ * the structre s_smpi_mpi_struct_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ */
+s_smpi_mpi_struct_t* smpi_datatype_struct_create( int* block_lengths,
+                                                  MPI_Aint* block_indices,
+                                                  int block_count,
+                                                  MPI_Datatype* old_types){
+  s_smpi_mpi_struct_t *new_t= xbt_new(s_smpi_mpi_struct_t,1);
+  new_t->base.serialize = &serialize_struct;
+  new_t->base.unserialize = &unserialize_struct;
+ //FIXME : copy those or assume they won't be freed ? 
+  new_t->block_lengths = block_lengths;
+  new_t->block_indices = block_indices;
+  new_t->block_count = block_count;
+  new_t->old_types = old_types;
+  return new_t;
+}
+
+
 int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type)
 {
   int i;
+  size_t size = 0;
   for(i=0; i< count; i++){
     if (blocklens[i]<=0)
       return MPI_ERR_ARG;
     if ((old_types[i]->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED)
       return MPI_ERR_TYPE;
+    size += blocklens[i]*smpi_datatype_size(old_types[i]);
   }
-  smpi_datatype_create(new_type,indices[count-1] + (blocklens[count-1]  * smpi_datatype_size(old_types[count-1])), DT_FLAG_DATA);
+
+
+  s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create( blocklens,
+                                                              indices,
+                                                              count,
+                                                              old_types);
+
+  smpi_datatype_create(new_type,  size ,1, subtype, DT_FLAG_DATA);
+
   return MPI_SUCCESS;
 }
 
-void smpi_datatype_commit(MPI_Datatypedatatype)
+void smpi_datatype_commit(MPI_Datatype *datatype)
 {
-  (*datatype)->flags= (*datatype)->flags | DT_FLAG_COMMITED);
+  (*datatype)->flags=  ((*datatype)->flags | DT_FLAG_COMMITED);
 }
 
 typedef struct s_smpi_mpi_op {
@@ -300,14 +780,14 @@ typedef struct s_smpi_mpi_op {
 //TODO : MINLOC & MAXLOC
 
 #define APPLY_FUNC(a, b, length, type, func) \
-  {                                          \
-    int i;                                   \
-    type* x = (type*)(a);                    \
-    type* y = (type*)(b);                    \
-    for(i = 0; i < *(length); i++) {         \
-      func(x[i], y[i]);                      \
-    }                                        \
-  }
+{                                          \
+  int i;                                   \
+  type* x = (type*)(a);                    \
+  type* y = (type*)(b);                    \
+  for(i = 0; i < *(length); i++) {         \
+    func(x[i], y[i]);                      \
+  }                                        \
+}
 
 static void max_func(void *a, void *b, int *length,
                      MPI_Datatype * datatype)
@@ -597,7 +1077,7 @@ static void maxloc_func(void *a, void *b, int *length,
 
 #define CREATE_MPI_OP(name, func)                             \
   static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */ }; \
-  MPI_Op name = &mpi_##name;
+MPI_Op name = &mpi_##name;
 
 CREATE_MPI_OP(MPI_MAX, max_func);
 CREATE_MPI_OP(MPI_MIN, min_func);