X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e4e8c06b0e29faa6be8391dfa8a1fe6fe5dd300..97b1421930b3e7d2a0e9fc7c501486a6d0b2d402:/src/smpi/mpi/smpi_datatype.cpp diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index d0a9b890fe..1bef5a1213 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -15,16 +15,17 @@ #include #include #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI (datatype)"); static std::unordered_map id2type_lookup; -#define CREATE_MPI_DATATYPE(name, id, type) \ +#define CREATE_MPI_DATATYPE(name, id, type, flag) \ simgrid::smpi::Datatype _XBT_CONCAT(smpi_MPI_, name)((char*)"MPI_"#name, (id), sizeof(type), /* size */ \ 0, /* lb */ \ sizeof(type), /* ub = lb + size */ \ - DT_FLAG_BASIC /* flags */ \ + DT_FLAG_BASIC | flag /* flags */ \ ); #define CREATE_MPI_DATATYPE_NULL(name, id) \ @@ -36,67 +37,71 @@ static std::unordered_map id2type_lookup; // Predefined data types CREATE_MPI_DATATYPE_NULL(DATATYPE_NULL, -1) -CREATE_MPI_DATATYPE(DOUBLE, 0, double) -CREATE_MPI_DATATYPE(INT, 1, int) -CREATE_MPI_DATATYPE(CHAR, 2, char) -CREATE_MPI_DATATYPE(SHORT, 3, short) -CREATE_MPI_DATATYPE(LONG, 4, long) -CREATE_MPI_DATATYPE(FLOAT, 5, float) -CREATE_MPI_DATATYPE(BYTE, 6, int8_t) -CREATE_MPI_DATATYPE(LONG_LONG, 7, long long) -CREATE_MPI_DATATYPE(SIGNED_CHAR, 8, signed char) -CREATE_MPI_DATATYPE(UNSIGNED_CHAR, 9, unsigned char) -CREATE_MPI_DATATYPE(UNSIGNED_SHORT, 10, unsigned short) -CREATE_MPI_DATATYPE(UNSIGNED, 11, unsigned int) -CREATE_MPI_DATATYPE(UNSIGNED_LONG, 12, unsigned long) -CREATE_MPI_DATATYPE(UNSIGNED_LONG_LONG, 13, unsigned long long) -CREATE_MPI_DATATYPE(LONG_DOUBLE, 14, long double) -CREATE_MPI_DATATYPE(WCHAR, 15, wchar_t) -CREATE_MPI_DATATYPE(C_BOOL, 16, bool) -CREATE_MPI_DATATYPE(INT8_T, 17, int8_t) -CREATE_MPI_DATATYPE(INT16_T, 18, int16_t) -CREATE_MPI_DATATYPE(INT32_T, 19, int32_t) -CREATE_MPI_DATATYPE(INT64_T, 20, int64_t) -CREATE_MPI_DATATYPE(UINT8_T, 21, uint8_t) -CREATE_MPI_DATATYPE(UINT16_T, 22, uint16_t) -CREATE_MPI_DATATYPE(UINT32_T, 23, uint32_t) -CREATE_MPI_DATATYPE(UINT64_T, 24, uint64_t) -CREATE_MPI_DATATYPE(C_FLOAT_COMPLEX, 25, float _Complex) -CREATE_MPI_DATATYPE(C_DOUBLE_COMPLEX, 26, double _Complex) -CREATE_MPI_DATATYPE(C_LONG_DOUBLE_COMPLEX, 27, long double _Complex) -CREATE_MPI_DATATYPE(AINT, 28, MPI_Aint) -CREATE_MPI_DATATYPE(OFFSET, 29, MPI_Offset) - -CREATE_MPI_DATATYPE(FLOAT_INT, 30, float_int) -CREATE_MPI_DATATYPE(LONG_INT, 31, long_int) -CREATE_MPI_DATATYPE(DOUBLE_INT, 32, double_int) -CREATE_MPI_DATATYPE(SHORT_INT, 33, short_int) -CREATE_MPI_DATATYPE(2INT, 34, int_int) -CREATE_MPI_DATATYPE(2FLOAT, 35, float_float) -CREATE_MPI_DATATYPE(2DOUBLE, 36, double_double) -CREATE_MPI_DATATYPE(2LONG, 37, long_long) - -CREATE_MPI_DATATYPE(REAL, 38, float) -CREATE_MPI_DATATYPE(REAL4, 39, float) -CREATE_MPI_DATATYPE(REAL8, 40, double) -CREATE_MPI_DATATYPE(REAL16, 41, long double) -CREATE_MPI_DATATYPE(COMPLEX8, 42, float_float) -CREATE_MPI_DATATYPE(COMPLEX16, 43, double_double) -CREATE_MPI_DATATYPE(COMPLEX32, 44, double_double) -CREATE_MPI_DATATYPE(INTEGER1, 45, int) -CREATE_MPI_DATATYPE(INTEGER2, 46, int16_t) -CREATE_MPI_DATATYPE(INTEGER4, 47, int32_t) -CREATE_MPI_DATATYPE(INTEGER8, 48, int64_t) -CREATE_MPI_DATATYPE(INTEGER16, 49, integer128_t) - -CREATE_MPI_DATATYPE(LONG_DOUBLE_INT, 50, long_double_int) - -CREATE_MPI_DATATYPE_NULL(UB, 51) -CREATE_MPI_DATATYPE_NULL(LB, 52) -CREATE_MPI_DATATYPE(PACKED, 53, char) +CREATE_MPI_DATATYPE(DOUBLE, 0, double, DT_FLAG_FP) +CREATE_MPI_DATATYPE(INT, 1, int, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(CHAR, 2, char, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(SHORT, 3, short, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(LONG, 4, long, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(FLOAT, 5, float, DT_FLAG_FP) +CREATE_MPI_DATATYPE(BYTE, 6, int8_t, DT_FLAG_BYTE) +CREATE_MPI_DATATYPE(LONG_LONG, 7, long long, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(SIGNED_CHAR, 8, signed char, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UNSIGNED_CHAR, 9, unsigned char, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UNSIGNED_SHORT, 10, unsigned short, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UNSIGNED, 11, unsigned int, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UNSIGNED_LONG, 12, unsigned long, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UNSIGNED_LONG_LONG, 13, unsigned long long, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(LONG_DOUBLE, 14, long double, DT_FLAG_FP) +CREATE_MPI_DATATYPE(WCHAR, 15, wchar_t, DT_FLAG_BASIC) +CREATE_MPI_DATATYPE(C_BOOL, 16, bool, DT_FLAG_LOGICAL) +CREATE_MPI_DATATYPE(INT8_T, 17, int8_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(INT16_T, 18, int16_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(INT32_T, 19, int32_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(INT64_T, 20, int64_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UINT8_T, 21, uint8_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UINT16_T, 22, uint16_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UINT32_T, 23, uint32_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(UINT64_T, 24, uint64_t, DT_FLAG_C_INTEGER) +CREATE_MPI_DATATYPE(C_FLOAT_COMPLEX, 25, float _Complex, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(C_DOUBLE_COMPLEX, 26, double _Complex, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(C_LONG_DOUBLE_COMPLEX, 27, long double _Complex, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(AINT, 28, MPI_Aint, DT_FLAG_MULTILANG) +CREATE_MPI_DATATYPE(OFFSET, 29, MPI_Offset, DT_FLAG_MULTILANG) + +CREATE_MPI_DATATYPE(FLOAT_INT, 30, float_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(LONG_INT, 31, long_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(DOUBLE_INT, 32, double_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(SHORT_INT, 33, short_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(2INT, 34, int_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(2FLOAT, 35, float_float, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(2DOUBLE, 36, double_double, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(2LONG, 37, long_long, DT_FLAG_REDUCTION) + +CREATE_MPI_DATATYPE(REAL, 38, float, DT_FLAG_FP) +CREATE_MPI_DATATYPE(REAL4, 39, float, DT_FLAG_FP) +CREATE_MPI_DATATYPE(REAL8, 40, double, DT_FLAG_FP) +CREATE_MPI_DATATYPE(REAL16, 41, long double, DT_FLAG_FP) +CREATE_MPI_DATATYPE(COMPLEX8, 42, float_float, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(COMPLEX16, 43, double_double, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(COMPLEX32, 44, double_double, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(INTEGER1, 45, int, DT_FLAG_F_INTEGER) +CREATE_MPI_DATATYPE(INTEGER2, 46, int16_t, DT_FLAG_F_INTEGER) +CREATE_MPI_DATATYPE(INTEGER4, 47, int32_t, DT_FLAG_F_INTEGER) +CREATE_MPI_DATATYPE(INTEGER8, 48, int64_t, DT_FLAG_F_INTEGER) +CREATE_MPI_DATATYPE(INTEGER16, 49, integer128_t, DT_FLAG_F_INTEGER) + +CREATE_MPI_DATATYPE(LONG_DOUBLE_INT, 50, long_double_int, DT_FLAG_REDUCTION) +CREATE_MPI_DATATYPE(CXX_BOOL, 51, bool, DT_FLAG_LOGICAL) +CREATE_MPI_DATATYPE(CXX_FLOAT_COMPLEX, 52, std::complex, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(CXX_DOUBLE_COMPLEX, 53, std::complex, DT_FLAG_COMPLEX) +CREATE_MPI_DATATYPE(CXX_LONG_DOUBLE_COMPLEX, 54, std::complex, DT_FLAG_COMPLEX) + +CREATE_MPI_DATATYPE_NULL(UB, 55) +CREATE_MPI_DATATYPE_NULL(LB, 56) +CREATE_MPI_DATATYPE(PACKED, 57, char, DT_FLAG_PREDEFINED) // Internal use only -CREATE_MPI_DATATYPE(PTR, 54, void*) -CREATE_MPI_DATATYPE(COUNT, 55, long long) +CREATE_MPI_DATATYPE(PTR, 58, void*, DT_FLAG_PREDEFINED) +CREATE_MPI_DATATYPE(COUNT, 59, long long, DT_FLAG_MULTILANG) MPI_Datatype MPI_PTR = &smpi_MPI_PTR; @@ -115,7 +120,7 @@ Datatype::Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags) : size_(size), this->add_f(); #if SIMGRID_HAVE_MC if(MC_is_active()) - MC_ignore(&(refcount_), sizeof(refcount_)); + MC_ignore(&refcount_, sizeof refcount_); #endif } @@ -126,7 +131,7 @@ Datatype::Datatype(const char* name, int ident, int size, MPI_Aint lb, MPI_Aint id2type_lookup.insert({id, this}); #if SIMGRID_HAVE_MC if(MC_is_active()) - MC_ignore(&(refcount_), sizeof(refcount_)); + MC_ignore(&refcount_, sizeof refcount_); #endif } @@ -145,14 +150,13 @@ Datatype::~Datatype() return; //prevent further usage flags_ &= ~ DT_FLAG_COMMITED; - F2C::free_f(this->c2f()); + F2C::free_f(this->f2c_id()); //if still used, mark for deletion if(refcount_!=0){ flags_ |=DT_FLAG_DESTROYED; return; } cleanup_attr(); - delete contents_; } int Datatype::copy_attrs(Datatype* datatype){ @@ -187,8 +191,7 @@ int Datatype::copy_attrs(Datatype* datatype){ } } } - delete contents_; - contents_ = new Datatype_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype); + set_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype); return ret; } @@ -204,7 +207,7 @@ void Datatype::ref() #if SIMGRID_HAVE_MC if(MC_is_active()) - MC_ignore(&(refcount_), sizeof(refcount_)); + MC_ignore(&refcount_, sizeof refcount_); #endif } @@ -215,7 +218,7 @@ void Datatype::unref(MPI_Datatype datatype) #if SIMGRID_HAVE_MC if(MC_is_active()) - MC_ignore(&(datatype->refcount_), sizeof(datatype->refcount_)); + MC_ignore(&datatype->refcount_, sizeof datatype->refcount_); #endif if (datatype->refcount_ == 0 && not(datatype->flags_ & DT_FLAG_PREDEFINED)) @@ -416,15 +419,15 @@ int Datatype::create_vector(int count, int block_length, int stride, MPI_Datatyp ub=((count-1)*stride+block_length-1)*old_type->get_extent()+old_type->ub(); } if(old_type->flags() & DT_FLAG_DERIVED || stride != block_length){ - *new_type = new Type_Vector(count * (block_length) * old_type->size(), lb, ub, - DT_FLAG_DERIVED, count, block_length, stride, old_type); + *new_type = new Type_Vector(count * block_length * old_type->size(), lb, ub, DT_FLAG_DERIVED, count, block_length, + stride, old_type); retval=MPI_SUCCESS; }else{ /* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/ *new_type = new Datatype(count * block_length * old_type->size(), 0, ((count -1) * stride + block_length)* old_type->size(), DT_FLAG_CONTIGUOUS); const std::array ints = {{count, block_length, stride}}; - (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_VECTOR, 3, ints.data(), 0, nullptr, 1, &old_type); + (*new_type)->set_contents(MPI_COMBINER_VECTOR, 3, ints.data(), 0, nullptr, 1, &old_type); retval=MPI_SUCCESS; } return retval; @@ -443,14 +446,14 @@ int Datatype::create_hvector(int count, int block_length, MPI_Aint stride, MPI_D ub=((count-1)*stride)+(block_length-1)*old_type->get_extent()+old_type->ub(); } if(old_type->flags() & DT_FLAG_DERIVED || stride != block_length*old_type->get_extent()){ - *new_type = new Type_Hvector(count * (block_length) * old_type->size(), lb, ub, - DT_FLAG_DERIVED, count, block_length, stride, old_type); + *new_type = new Type_Hvector(count * block_length * old_type->size(), lb, ub, DT_FLAG_DERIVED, count, block_length, + stride, old_type); retval=MPI_SUCCESS; }else{ /* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/ *new_type = new Datatype(count * block_length * old_type->size(), 0, count * block_length * old_type->size(), DT_FLAG_CONTIGUOUS); const std::array ints = {{count, block_length}}; - (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_HVECTOR, 2, ints.data(), 1, &stride, 1, &old_type); + (*new_type)->set_contents(MPI_COMBINER_HVECTOR, 2, ints.data(), 1, &stride, 1, &old_type); retval=MPI_SUCCESS; } return retval;