}; \
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 {
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*);
/*
* 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
*
*/
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;
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);
}
int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type)
{
int retval;
- if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
- smpi_datatype_create(new_type, count *
- smpi_datatype_size(old_type),1,NULL, DT_FLAG_CONTIGUOUS);
- retval=MPI_SUCCESS;
- }
+ 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;
return retval;
}
{
int retval;
if (blocklen<=0) return MPI_ERR_ARG;
- if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
- if(stride != blocklen){
-if (old_type->has_subtype == 1)
- XBT_WARN("vector contains a complex type - not yet handled");
- 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|DT_FLAG_CONTIGUOUS);
- retval=MPI_SUCCESS;
- }
+ if(stride != blocklen){
+ if (old_type->has_subtype == 1)
+ XBT_WARN("vector contains a complex type - not yet handled");
+ 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),
+ ((count -1) * stride + 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), ((count -1) * stride + blocklen)*
+ smpi_datatype_size(old_type),
+ 0,
+ NULL,
+ DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
+ retval=MPI_SUCCESS;
}
return retval;
}
-
+void free_vector(MPI_Datatype* d){
+}
/*
Hvector Implementation - Vector with stride in bytes
/*
* 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
*
*/
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;
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;
if (blocklen<=0) return MPI_ERR_ARG;
- if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
-if (old_type->has_subtype == 1)
+ if (old_type->has_subtype == 1)
XBT_WARN("hvector contains a complex type - not yet handled");
- 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|DT_FLAG_CONTIGUOUS);
- 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), (count-1) * stride + 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),count * blocklen *
+ smpi_datatype_size(old_type),
+ 0,
+ NULL,
+ DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
+ retval=MPI_SUCCESS;
}
return retval;
}
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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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 *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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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,
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;i<block_count;i++){
+ new_t->block_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;
if ( (i< count -1) && (indices[i]+blocklens[i] != indices[i+1]) )contiguous=0;
}
- if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
+ if (old_type->has_subtype == 1)
+ XBT_WARN("indexed contains a complex type - not yet handled");
- if (old_type->has_subtype == 1)
- XBT_WARN("indexed contains a complex type - not yet handled");
-
- if(!contiguous){
- 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);
-}else{
- smpi_datatype_create(new_type, size *
- smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
-}
- retval=MPI_SUCCESS;
+ if(!contiguous){
+ 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),(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;
return retval;
}
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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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 *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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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,
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;i<block_count;i++){
+ new_t->block_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;
if (blocklens[i]<=0)
return MPI_ERR_ARG;
size += blocklens[i];
-
-
if ( (i< count -1) && (indices[i]+blocklens[i]*smpi_datatype_size(old_type) != indices[i+1]) )contiguous=0;
}
- if ((old_type->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
- if (old_type->has_subtype == 1)
- XBT_WARN("hindexed contains a complex type - not yet handled");
-
- if(!contiguous){
- 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);
- }else{
- smpi_datatype_create(new_type, size *
- smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
- }
- retval=MPI_SUCCESS;
+ if (old_type->has_subtype == 1)
+ XBT_WARN("hindexed contains a complex type - not yet handled");
+ if(!contiguous){
+ 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),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;
return retval;
}
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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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;
}
}
/*
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; j<count;j++){
+ for (i = 0; i < type_c->block_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 (i<type_c->block_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,
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;i<block_count;i++){
+ new_t->block_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;
}
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;
if (old_types[i]->has_subtype == 1)
XBT_WARN("Struct contains a complex type - not yet handled");
size += blocklens[i]*smpi_datatype_size(old_types[i]);
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;
}
