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*);
{
int retval;
- if ((datatype->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
- retval = MPI_ERR_TYPE;
- } else {
+// if ((datatype->flags & DT_FLAG_COMMITED) != DT_FLAG_COMMITED) {
+// retval = MPI_ERR_TYPE;
+// } else {
*lb = datatype->lb;
*extent = datatype->ub - datatype->lb;
retval = MPI_SUCCESS;
- }
+// }
return retval;
}
+MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype){
+ MPI_Aint lb;
+ MPI_Aint extent;
+ smpi_datatype_extent(datatype, &lb, &extent);
+ return extent;
+}
+
int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype)
{
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);
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(contiguous_vector_char,
+ noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
+ contiguous_vector_char,
+ type_c->block_length,
+ type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
- noncontiguous_vector_char += type_c->block_stride*type_c->size_oldtype;
+ noncontiguous_vector_char += type_c->block_stride*smpi_datatype_get_extent(type_c->old_type);
}
}
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);
-
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(noncontiguous_vector_char,
+ contiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_vector_char,
+ noncontiguous_vector_char,
+ type_c->block_length,
+ type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
- noncontiguous_vector_char += type_c->block_stride*type_c->size_oldtype;
+ noncontiguous_vector_char += type_c->block_stride*smpi_datatype_get_extent(type_c->old_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),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),
- ((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;
- }
+ if(old_type->has_subtype || 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),
+ ((count -1) * stride + blocklen) * smpi_datatype_get_extent(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;
}
char* noncontiguous_vector_char = (char*)noncontiguous_hvector;
for (i = 0; i < type_c->block_count * count; i++) {
- memcpy(contiguous_vector_char,
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(contiguous_vector_char,
noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
+ contiguous_vector_char,
+ type_c->block_length,
+ type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
noncontiguous_vector_char += type_c->block_stride;
char* noncontiguous_vector_char = (char*)noncontiguous_vector;
for (i = 0; i < type_c->block_count * count; i++) {
- memcpy(noncontiguous_vector_char,
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(noncontiguous_vector_char,
contiguous_vector_char, type_c->block_length * type_c->size_oldtype);
-
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_vector_char,
+ noncontiguous_vector_char,
+ type_c->block_length,
+ type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
noncontiguous_vector_char += type_c->block_stride;
}
{
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)
- 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), (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;
- }
+ if(old_type->has_subtype || stride != blocklen*smpi_datatype_get_extent(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;
}
char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
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);
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(contiguous_indexed_char,
+ noncontiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_indexed_char,
+ contiguous_indexed_char,
+ type_c->block_lengths[i],
+ type_c->old_type->substruct);
+
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;
+ if (i<type_c->block_count-1)noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
+ else noncontiguous_indexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
noncontiguous_indexed=(void*)noncontiguous_indexed_char;
}
char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- memcpy(noncontiguous_indexed_char,
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(noncontiguous_indexed_char,
contiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_indexed_char,
+ noncontiguous_indexed_char,
+ type_c->block_lengths[i],
+ type_c->old_type->substruct);
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;
+ if (i<type_c->block_count-1)
+ noncontiguous_indexed_char = (char*)noncontiguous_indexed + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
+ else noncontiguous_indexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
noncontiguous_indexed=(void*)noncontiguous_indexed_char;
}
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)
+ contiguous=0;
- 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),(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;
+ 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;
}
char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
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);
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(contiguous_hindexed_char,
+ noncontiguous_hindexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_hindexed_char,
+ contiguous_hindexed_char,
+ type_c->block_lengths[i],
+ type_c->old_type->substruct);
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;
+ else noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
noncontiguous_hindexed=(void*)noncontiguous_hindexed_char;
}
char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
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);
+ if (type_c->old_type->has_subtype == 0)
+ memcpy(noncontiguous_hindexed_char,
+ contiguous_hindexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
+ else
+ ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_hindexed_char,
+ noncontiguous_hindexed_char,
+ type_c->block_lengths[i],
+ type_c->old_type->substruct);
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;
+ else noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
noncontiguous_hindexed=(void*)noncontiguous_hindexed_char;
}
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),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;
+ if (old_type->has_subtype == 1)
+ contiguous=0;
+ 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;
}
char* noncontiguous_struct_char = (char*)noncontiguous_struct;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- memcpy(contiguous_struct_char,
+ if (type_c->old_types[i]->has_subtype == 0)
+ memcpy(contiguous_struct_char,
noncontiguous_struct_char, type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));
+ else
+ ((s_smpi_subtype_t*)type_c->old_types[i]->substruct)->serialize( noncontiguous_struct_char,
+ contiguous_struct_char,
+ type_c->block_lengths[i],
+ type_c->old_types[i]->substruct);
+
+
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 ?
+ else noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_types[i]);//let's hope this is MPI_UB ?
}
noncontiguous_struct=(void*)noncontiguous_struct_char;
}
char* noncontiguous_struct_char = (char*)noncontiguous_struct;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- memcpy(noncontiguous_struct_char,
+ if (type_c->old_types[i]->has_subtype == 0)
+ memcpy(noncontiguous_struct_char,
contiguous_struct_char, type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));
+ else
+ ((s_smpi_subtype_t*)type_c->old_types[i]->substruct)->unserialize( contiguous_struct_char,
+ noncontiguous_struct_char,
+ type_c->block_lengths[i],
+ type_c->old_types[i]->substruct);
+
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]);
+ else noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_types[i]);
}
noncontiguous_struct=(void*)noncontiguous_struct_char;
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");
+ contiguous=0;
size += blocklens[i]*smpi_datatype_size(old_types[i]);
if ( (i< count -1) && (indices[i]+blocklens[i]*smpi_datatype_size(old_types[i]) != indices[i+1]) )contiguous=0;
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);
}
}