X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595f25a34a76a3e467bf1bd12bc8d2ee0e8070e8..b2208a5ab266b760d9b1b26198b38f2b0ade2e26:/src/smpi/smpi_mpi_dt.c diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c index 1561ddd5b1..5e22c33a20 100644 --- a/src/smpi/smpi_mpi_dt.c +++ b/src/smpi/smpi_mpi_dt.c @@ -28,6 +28,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi, }; \ MPI_Datatype name = &mpi_##name; +#define CREATE_MPI_DATATYPE_NULL(name) \ + static s_smpi_mpi_datatype_t mpi_##name = { \ + 0, /* size */ \ + 0, /*was 1 has_subtype*/ \ + 0, /* lb */ \ + 0, /* ub = lb + size */ \ + DT_FLAG_BASIC, /* flags */ \ + NULL /* pointer on extended struct*/ \ + }; \ +MPI_Datatype name = &mpi_##name; //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC. typedef struct { @@ -93,6 +103,9 @@ CREATE_MPI_DATATYPE(MPI_SHORT_INT, short_int); CREATE_MPI_DATATYPE(MPI_2INT, int_int); CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE_INT, long_double_int); +CREATE_MPI_DATATYPE_NULL(MPI_UB); +CREATE_MPI_DATATYPE_NULL(MPI_LB); +CREATE_MPI_DATATYPE_NULL(MPI_PACKED); // Internal use only CREATE_MPI_DATATYPE(MPI_PTR, void*); @@ -233,7 +246,7 @@ void unserialize_vector( const void *contiguous_vector, /* * 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 + * the structure s_smpi_mpi_vector_t is derived from s_smpi_subtype which * required the functions unserialize and serialize * */ @@ -245,6 +258,7 @@ s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, 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->base.subtype_free = &free_vector; new_t->block_stride = block_stride; new_t->block_length = block_length; new_t->block_count = block_count; @@ -253,19 +267,22 @@ s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, return new_t; } -void smpi_datatype_create(MPI_Datatype* new_type, int size, int has_subtype, +void smpi_datatype_create(MPI_Datatype* new_type, int size,int extent, 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->has_subtype = has_subtype; new_t->lb = 0; - new_t->ub = size; + new_t->ub = extent; new_t->flags = flags; new_t->substruct = struct_type; *new_type = new_t; } void smpi_datatype_free(MPI_Datatype* type){ + if ((*type)->has_subtype == 1){ + ((s_smpi_subtype_t *)(*type)->substruct)->subtype_free(type); + } xbt_free(*type); } @@ -276,6 +293,7 @@ int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new retval = MPI_ERR_TYPE; } else { smpi_datatype_create(new_type, count * + smpi_datatype_size(old_type),count * smpi_datatype_size(old_type),0,NULL, DT_FLAG_CONTIGUOUS); retval=MPI_SUCCESS; } @@ -300,6 +318,7 @@ if (old_type->has_subtype == 1) smpi_datatype_create(new_type, count * (blocklen) * smpi_datatype_size(old_type), + ((count -1) * stride + blocklen) * smpi_datatype_size(old_type), 1, subtype, DT_FLAG_VECTOR); @@ -308,6 +327,7 @@ if (old_type->has_subtype == 1) /* 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), ((count -1) * stride + blocklen)* smpi_datatype_size(old_type), 0, NULL, @@ -318,7 +338,8 @@ if (old_type->has_subtype == 1) return retval; } - +void free_vector(MPI_Datatype* d){ +} /* Hvector Implementation - Vector with stride in bytes @@ -383,7 +404,7 @@ void unserialize_hvector( const void *contiguous_vector, /* * 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 + * the structure s_smpi_mpi_vector_t is derived from s_smpi_subtype which * required the functions unserialize and serialize * */ @@ -395,6 +416,7 @@ s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, 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->base.subtype_free = &free_hvector; new_t->block_stride = block_stride; new_t->block_length = block_length; new_t->block_count = block_count; @@ -403,6 +425,10 @@ s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, return new_t; } +//do nothing for vector types +void free_hvector(MPI_Datatype* d){ +} + int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) { int retval; @@ -420,6 +446,7 @@ if (old_type->has_subtype == 1) smpi_datatype_size(old_type)); smpi_datatype_create(new_type, count * blocklen * + smpi_datatype_size(old_type), (count-1) * stride + blocklen * smpi_datatype_size(old_type), 1, subtype, @@ -427,6 +454,7 @@ if (old_type->has_subtype == 1) retval=MPI_SUCCESS; }else{ smpi_datatype_create(new_type, count * blocklen * + smpi_datatype_size(old_type),count * blocklen * smpi_datatype_size(old_type), 0, NULL, @@ -457,16 +485,19 @@ void serialize_indexed( const void *noncontiguous_indexed, void *type) { s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type; - int i; + int i,j; 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; + for(j=0; jblock_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; + if (iblock_count-1)noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*type_c->size_oldtype; + else noncontiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype; + } + noncontiguous_indexed=(void*)noncontiguous_indexed_char; } } /* @@ -484,23 +515,31 @@ void unserialize_indexed( const void *contiguous_indexed, void *type) { s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type; - int i; + int i,j; 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; + for(j=0; jblock_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; + if (iblock_count-1)noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*type_c->size_oldtype; + else noncontiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype; + } + noncontiguous_indexed=(void*)noncontiguous_indexed_char; } } +void free_indexed(MPI_Datatype* type){ + xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_lengths); + xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_indices); +} + /* * 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 + * the structure 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, @@ -511,9 +550,15 @@ s_smpi_mpi_indexed_t* smpi_datatype_indexed_create( int* block_lengths, 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->base.subtype_free = &free_indexed; + //TODO : add a custom function for each time to clean these + new_t->block_lengths= xbt_new(int, block_count); + new_t->block_indices= xbt_new(int, block_count); + int i; + for(i=0;iblock_lengths[i]=block_lengths[i]; + new_t->block_indices[i]=block_indices[i]; + } new_t->block_count = block_count; new_t->old_type = old_type; new_t->size_oldtype = size_oldtype; @@ -549,9 +594,10 @@ int smpi_datatype_indexed(int count, int* blocklens, int* indices, MPI_Datatype smpi_datatype_size(old_type)); smpi_datatype_create(new_type, size * - smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA); + smpi_datatype_size(old_type),(indices[count-1]+blocklens[count-1])*smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA); }else{ smpi_datatype_create(new_type, size * + smpi_datatype_size(old_type),size * smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS); } retval=MPI_SUCCESS; @@ -579,16 +625,19 @@ void serialize_hindexed( const void *noncontiguous_hindexed, void *type) { s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type; - int i; + int i,j; 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]; + for(j=0; jblock_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; + if (iblock_count-1)noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1]; + else noncontiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype; + } + noncontiguous_hindexed=(void*)noncontiguous_hindexed_char; } } /* @@ -606,23 +655,31 @@ void unserialize_hindexed( const void *contiguous_hindexed, void *type) { s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type; - int i; + int i,j; 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]; + for(j=0; jblock_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; + if (iblock_count-1)noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1]; + else noncontiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype; + } + noncontiguous_hindexed=(void*)noncontiguous_hindexed_char; } } +void free_hindexed(MPI_Datatype* type){ + xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_lengths); + xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_indices); +} + /* * 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 + * the structure 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, @@ -633,9 +690,15 @@ s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create( int* block_lengths, 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->base.subtype_free = &free_hindexed; + //TODO : add a custom function for each time to clean these + new_t->block_lengths= xbt_new(int, block_count); + new_t->block_indices= xbt_new(MPI_Aint, block_count); + int i; + for(i=0;iblock_lengths[i]=block_lengths[i]; + new_t->block_indices[i]=block_indices[i]; + } new_t->block_count = block_count; new_t->old_type = old_type; new_t->size_oldtype = size_oldtype; @@ -671,9 +734,11 @@ int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Dat smpi_datatype_size(old_type)); smpi_datatype_create(new_type, size * - smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA); + smpi_datatype_size(old_type),indices[count-1]+blocklens[count-1]*smpi_datatype_size(old_type) + ,1, subtype, DT_FLAG_DATA); }else{ smpi_datatype_create(new_type, size * + smpi_datatype_size(old_type),size * smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS); } retval=MPI_SUCCESS; @@ -701,15 +766,18 @@ void serialize_struct( const void *noncontiguous_struct, void *type) { s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type; - int i; + int i,j; 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]; + for(j=0; jblock_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]); + if (iblock_count-1)noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1]; + else noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);//let's hope this is MPI_UB ? + } + noncontiguous_struct=(void*)noncontiguous_struct_char; } } /* @@ -727,22 +795,32 @@ void unserialize_struct( const void *contiguous_struct, void *type) { s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type; - int i; + int i,j; 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]; + for(j=0; jblock_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]); + if (iblock_count-1)noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1]; + else noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]); + } + noncontiguous_struct=(void*)noncontiguous_struct_char; + } } +void free_struct(MPI_Datatype* type){ + xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_lengths); + xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_indices); + xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->old_types); +} + /* * 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 + * the structure 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, @@ -752,11 +830,21 @@ s_smpi_mpi_struct_t* smpi_datatype_struct_create( int* block_lengths, 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->base.subtype_free = &free_struct; + //TODO : add a custom function for each time to clean these + new_t->block_lengths= xbt_new(int, block_count); + new_t->block_indices= xbt_new(MPI_Aint, block_count); + new_t->old_types= xbt_new(MPI_Datatype, block_count); + int i; + for(i=0;iblock_lengths[i]=block_lengths[i]; + new_t->block_indices[i]=block_indices[i]; + new_t->old_types[i]=old_types[i]; + } + //new_t->block_lengths = block_lengths; + //new_t->block_indices = block_indices; new_t->block_count = block_count; - new_t->old_types = old_types; + //new_t->old_types = old_types; return new_t; } @@ -785,9 +873,9 @@ int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datat count, old_types); - smpi_datatype_create(new_type, size ,1, subtype, DT_FLAG_DATA); + smpi_datatype_create(new_type, size, indices[count-1] + blocklens[count-1]*smpi_datatype_size(old_types[count-1]),1, subtype, DT_FLAG_DATA); }else{ - smpi_datatype_create(new_type, size,0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS); + smpi_datatype_create(new_type, size, indices[count-1] + blocklens[count-1]*smpi_datatype_size(old_types[count-1]),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS); } return MPI_SUCCESS; }