float value;
int index;
} float_int;
+typedef struct {
+ float value;
+ float index;
+} float_float;
+typedef struct {
+ double value;
+ double index;
+} double_double;
typedef struct {
long value;
int index;
CREATE_MPI_DATATYPE(MPI_DOUBLE_INT, double_int);
CREATE_MPI_DATATYPE(MPI_SHORT_INT, short_int);
CREATE_MPI_DATATYPE(MPI_2INT, int_int);
+CREATE_MPI_DATATYPE(MPI_2FLOAT, float_float);
+CREATE_MPI_DATATYPE(MPI_2DOUBLE, double_double);
+
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*);
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),0,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
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 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 structure s_smpi_mpi_indexed_t is derived from s_smpi_subtype which
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;
+ 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);
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 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 structure s_smpi_mpi_hindexed_t is derived from s_smpi_subtype which
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;
+ 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);
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 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 structure s_smpi_mpi_struct_t is derived from s_smpi_subtype which
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;
+ 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);
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;
}
APPLY_FUNC(a, b, length, int_int, MINLOC_OP);
} else if (*datatype == MPI_LONG_DOUBLE_INT) {
APPLY_FUNC(a, b, length, long_double_int, MINLOC_OP);
+ } else if (*datatype == MPI_2FLOAT) {
+ APPLY_FUNC(a, b, length, float_float, MINLOC_OP);
+ } else if (*datatype == MPI_2DOUBLE) {
+ APPLY_FUNC(a, b, length, double_double, MINLOC_OP);
}
}
APPLY_FUNC(a, b, length, int_int, MAXLOC_OP);
} else if (*datatype == MPI_LONG_DOUBLE_INT) {
APPLY_FUNC(a, b, length, long_double_int, MAXLOC_OP);
+ } else if (*datatype == MPI_2FLOAT) {
+ APPLY_FUNC(a, b, length, float_float, MAXLOC_OP);
+ } else if (*datatype == MPI_2DOUBLE) {
+ APPLY_FUNC(a, b, length, double_double, MAXLOC_OP);
}
}