X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ee2e44a3edbbc748f872f517d1cd9082dce0baf..1746e0d39563b9a808ae7d76baaf0ad344d33ee6:/src/smpi/mpi/smpi_datatype.cpp diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index a4b307fd57..a7ea791711 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -1,5 +1,5 @@ /* smpi_datatype.cpp -- MPI primitives to handle datatypes */ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,6 +11,8 @@ #include "src/instr/instr_private.hpp" #include "src/smpi/include/smpi_actor.hpp" +#include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI (datatype)"); @@ -18,84 +20,84 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI ( static std::unordered_map id2type_lookup; #define CREATE_MPI_DATATYPE(name, id, type) \ - static simgrid::smpi::Datatype _XBT_CONCAT(mpi_, name)((char*)_XBT_STRINGIFY(name), id, sizeof(type), /* size */ \ - 0, /* lb */ \ + static simgrid::smpi::Datatype _XBT_CONCAT(mpi_, name)((char*)_XBT_STRINGIFY(name), (id), sizeof(type), /* size */ \ + 0, /* lb */ \ sizeof(type), /* ub = lb + size */ \ DT_FLAG_BASIC /* flags */ \ ); \ const MPI_Datatype name = &_XBT_CONCAT(mpi_, name); #define CREATE_MPI_DATATYPE_NULL(name, id) \ - static simgrid::smpi::Datatype _XBT_CONCAT(mpi_, name)((char*)_XBT_STRINGIFY(name), id, 0, /* size */ \ - 0, /* lb */ \ - 0, /* ub = lb + size */ \ - DT_FLAG_BASIC /* flags */ \ + static simgrid::smpi::Datatype _XBT_CONCAT(mpi_, name)((char*)_XBT_STRINGIFY(name), (id), 0, /* size */ \ + 0, /* lb */ \ + 0, /* ub = lb + size */ \ + DT_FLAG_BASIC /* flags */ \ ); \ const MPI_Datatype name = &_XBT_CONCAT(mpi_, name); // Predefined data types -CREATE_MPI_DATATYPE(MPI_CHAR, 2, char); -CREATE_MPI_DATATYPE(MPI_SHORT, 3, short); -CREATE_MPI_DATATYPE(MPI_INT, 1, int); -CREATE_MPI_DATATYPE(MPI_LONG, 4, long); -CREATE_MPI_DATATYPE(MPI_LONG_LONG, 7, long long); -CREATE_MPI_DATATYPE(MPI_SIGNED_CHAR, 8, signed char); -CREATE_MPI_DATATYPE(MPI_UNSIGNED_CHAR, 9, unsigned char); -CREATE_MPI_DATATYPE(MPI_UNSIGNED_SHORT, 10, unsigned short); -CREATE_MPI_DATATYPE(MPI_UNSIGNED, 11, unsigned int); -CREATE_MPI_DATATYPE(MPI_UNSIGNED_LONG, 12, unsigned long); -CREATE_MPI_DATATYPE(MPI_UNSIGNED_LONG_LONG, 13, unsigned long long); -CREATE_MPI_DATATYPE(MPI_FLOAT, 5, float); -CREATE_MPI_DATATYPE(MPI_DOUBLE, 0, double); -CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE, 14, long double); -CREATE_MPI_DATATYPE(MPI_WCHAR, 15, wchar_t); -CREATE_MPI_DATATYPE(MPI_C_BOOL, 16, bool); -CREATE_MPI_DATATYPE(MPI_BYTE, 6, int8_t); -CREATE_MPI_DATATYPE(MPI_INT8_T, 17, int8_t); -CREATE_MPI_DATATYPE(MPI_INT16_T, 18, int16_t); -CREATE_MPI_DATATYPE(MPI_INT32_T, 19, int32_t); -CREATE_MPI_DATATYPE(MPI_INT64_T, 20, int64_t); -CREATE_MPI_DATATYPE(MPI_UINT8_T, 21, uint8_t); -CREATE_MPI_DATATYPE(MPI_UINT16_T, 22, uint16_t); -CREATE_MPI_DATATYPE(MPI_UINT32_T, 23, uint32_t); -CREATE_MPI_DATATYPE(MPI_UINT64_T, 24, uint64_t); -CREATE_MPI_DATATYPE(MPI_C_FLOAT_COMPLEX, 25, float _Complex); -CREATE_MPI_DATATYPE(MPI_C_DOUBLE_COMPLEX, 26, double _Complex); -CREATE_MPI_DATATYPE(MPI_C_LONG_DOUBLE_COMPLEX, 27, long double _Complex); -CREATE_MPI_DATATYPE(MPI_AINT, 28, MPI_Aint); -CREATE_MPI_DATATYPE(MPI_OFFSET, 29, MPI_Offset); - -CREATE_MPI_DATATYPE(MPI_FLOAT_INT, 30, float_int); -CREATE_MPI_DATATYPE(MPI_LONG_INT, 31, long_int); -CREATE_MPI_DATATYPE(MPI_DOUBLE_INT, 32, double_int); -CREATE_MPI_DATATYPE(MPI_SHORT_INT, 33, short_int); -CREATE_MPI_DATATYPE(MPI_2INT, 34, int_int); -CREATE_MPI_DATATYPE(MPI_2FLOAT, 35, float_float); -CREATE_MPI_DATATYPE(MPI_2DOUBLE, 36, double_double); -CREATE_MPI_DATATYPE(MPI_2LONG, 37, long_long); - -CREATE_MPI_DATATYPE(MPI_REAL, 38, float); -CREATE_MPI_DATATYPE(MPI_REAL4, 39, float); -CREATE_MPI_DATATYPE(MPI_REAL8, 40, double); -CREATE_MPI_DATATYPE(MPI_REAL16, 41, long double); -CREATE_MPI_DATATYPE_NULL(MPI_DATATYPE_NULL, -1); -CREATE_MPI_DATATYPE(MPI_COMPLEX8, 42, float_float); -CREATE_MPI_DATATYPE(MPI_COMPLEX16, 43, double_double); -CREATE_MPI_DATATYPE(MPI_COMPLEX32, 44, double_double); -CREATE_MPI_DATATYPE(MPI_INTEGER1, 45, int); -CREATE_MPI_DATATYPE(MPI_INTEGER2, 46, int16_t); -CREATE_MPI_DATATYPE(MPI_INTEGER4, 47, int32_t); -CREATE_MPI_DATATYPE(MPI_INTEGER8, 48, int64_t); -CREATE_MPI_DATATYPE(MPI_INTEGER16, 49, integer128_t); - -CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE_INT, 50, long_double_int); - -CREATE_MPI_DATATYPE_NULL(MPI_UB, 51); -CREATE_MPI_DATATYPE_NULL(MPI_LB, 52); -CREATE_MPI_DATATYPE(MPI_PACKED, 53, char); +CREATE_MPI_DATATYPE(MPI_CHAR, 2, char) +CREATE_MPI_DATATYPE(MPI_SHORT, 3, short) +CREATE_MPI_DATATYPE(MPI_INT, 1, int) +CREATE_MPI_DATATYPE(MPI_LONG, 4, long) +CREATE_MPI_DATATYPE(MPI_LONG_LONG, 7, long long) +CREATE_MPI_DATATYPE(MPI_SIGNED_CHAR, 8, signed char) +CREATE_MPI_DATATYPE(MPI_UNSIGNED_CHAR, 9, unsigned char) +CREATE_MPI_DATATYPE(MPI_UNSIGNED_SHORT, 10, unsigned short) +CREATE_MPI_DATATYPE(MPI_UNSIGNED, 11, unsigned int) +CREATE_MPI_DATATYPE(MPI_UNSIGNED_LONG, 12, unsigned long) +CREATE_MPI_DATATYPE(MPI_UNSIGNED_LONG_LONG, 13, unsigned long long) +CREATE_MPI_DATATYPE(MPI_FLOAT, 5, float) +CREATE_MPI_DATATYPE(MPI_DOUBLE, 0, double) +CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE, 14, long double) +CREATE_MPI_DATATYPE(MPI_WCHAR, 15, wchar_t) +CREATE_MPI_DATATYPE(MPI_C_BOOL, 16, bool) +CREATE_MPI_DATATYPE(MPI_BYTE, 6, int8_t) +CREATE_MPI_DATATYPE(MPI_INT8_T, 17, int8_t) +CREATE_MPI_DATATYPE(MPI_INT16_T, 18, int16_t) +CREATE_MPI_DATATYPE(MPI_INT32_T, 19, int32_t) +CREATE_MPI_DATATYPE(MPI_INT64_T, 20, int64_t) +CREATE_MPI_DATATYPE(MPI_UINT8_T, 21, uint8_t) +CREATE_MPI_DATATYPE(MPI_UINT16_T, 22, uint16_t) +CREATE_MPI_DATATYPE(MPI_UINT32_T, 23, uint32_t) +CREATE_MPI_DATATYPE(MPI_UINT64_T, 24, uint64_t) +CREATE_MPI_DATATYPE(MPI_C_FLOAT_COMPLEX, 25, float _Complex) +CREATE_MPI_DATATYPE(MPI_C_DOUBLE_COMPLEX, 26, double _Complex) +CREATE_MPI_DATATYPE(MPI_C_LONG_DOUBLE_COMPLEX, 27, long double _Complex) +CREATE_MPI_DATATYPE(MPI_AINT, 28, MPI_Aint) +CREATE_MPI_DATATYPE(MPI_OFFSET, 29, MPI_Offset) + +CREATE_MPI_DATATYPE(MPI_FLOAT_INT, 30, float_int) +CREATE_MPI_DATATYPE(MPI_LONG_INT, 31, long_int) +CREATE_MPI_DATATYPE(MPI_DOUBLE_INT, 32, double_int) +CREATE_MPI_DATATYPE(MPI_SHORT_INT, 33, short_int) +CREATE_MPI_DATATYPE(MPI_2INT, 34, int_int) +CREATE_MPI_DATATYPE(MPI_2FLOAT, 35, float_float) +CREATE_MPI_DATATYPE(MPI_2DOUBLE, 36, double_double) +CREATE_MPI_DATATYPE(MPI_2LONG, 37, long_long) + +CREATE_MPI_DATATYPE(MPI_REAL, 38, float) +CREATE_MPI_DATATYPE(MPI_REAL4, 39, float) +CREATE_MPI_DATATYPE(MPI_REAL8, 40, double) +CREATE_MPI_DATATYPE(MPI_REAL16, 41, long double) +CREATE_MPI_DATATYPE_NULL(MPI_DATATYPE_NULL, -1) +CREATE_MPI_DATATYPE(MPI_COMPLEX8, 42, float_float) +CREATE_MPI_DATATYPE(MPI_COMPLEX16, 43, double_double) +CREATE_MPI_DATATYPE(MPI_COMPLEX32, 44, double_double) +CREATE_MPI_DATATYPE(MPI_INTEGER1, 45, int) +CREATE_MPI_DATATYPE(MPI_INTEGER2, 46, int16_t) +CREATE_MPI_DATATYPE(MPI_INTEGER4, 47, int32_t) +CREATE_MPI_DATATYPE(MPI_INTEGER8, 48, int64_t) +CREATE_MPI_DATATYPE(MPI_INTEGER16, 49, integer128_t) + +CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE_INT, 50, long_double_int) + +CREATE_MPI_DATATYPE_NULL(MPI_UB, 51) +CREATE_MPI_DATATYPE_NULL(MPI_LB, 52) +CREATE_MPI_DATATYPE(MPI_PACKED, 53, char) // Internal use only -CREATE_MPI_DATATYPE(MPI_PTR, 54, void*); -CREATE_MPI_DATATYPE(MPI_COUNT, 55, long long); +CREATE_MPI_DATATYPE(MPI_PTR, 54, void*) +CREATE_MPI_DATATYPE(MPI_COUNT, 55, long long) namespace simgrid{ @@ -107,14 +109,16 @@ Datatype::Datatype(int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags) : D { id = std::to_string(ident); } -Datatype::Datatype(int size,MPI_Aint lb, MPI_Aint ub, int flags) : name_(nullptr), size_(size), lb_(lb), ub_(ub), flags_(flags), refcount_(1){ + +Datatype::Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags) : size_(size), lb_(lb), ub_(ub), flags_(flags) +{ #if SIMGRID_HAVE_MC if(MC_is_active()) MC_ignore(&(refcount_), sizeof(refcount_)); #endif } -//for predefined types, so in_use = 0. +// for predefined types, so refcount_ = 0. Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags) : name_(name), id(std::to_string(ident)), size_(size), lb_(lb), ub_(ub), flags_(flags), refcount_(0) { @@ -125,12 +129,33 @@ Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, in #endif } -Datatype::Datatype(Datatype *datatype, int* ret) : name_(nullptr), size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_), refcount_(1) +Datatype::Datatype(Datatype* datatype, int* ret) + : size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_) +{ + *ret = this->copy_attrs(datatype); +} + +Datatype::~Datatype() { + xbt_assert(refcount_ >= 0); + + if(flags_ & DT_FLAG_PREDEFINED) + return; + + //if still used, mark for deletion + if(refcount_!=0){ + flags_ |=DT_FLAG_DESTROYED; + return; + } + + cleanup_attr(); + delete contents_; + xbt_free(name_); +} + +int Datatype::copy_attrs(Datatype* datatype){ flags_ &= ~DT_FLAG_PREDEFINED; - *ret = MPI_SUCCESS; - if(datatype->name_) - name_ = xbt_strdup(datatype->name_); + int ret = MPI_SUCCESS; if (not datatype->attributes()->empty()) { int flag=0; @@ -140,13 +165,13 @@ Datatype::Datatype(Datatype *datatype, int* ret) : name_(nullptr), size_(datatyp if (elem != nullptr){ if( elem->copy_fn.type_copy_fn != MPI_NULL_COPY_FN && elem->copy_fn.type_copy_fn != MPI_TYPE_DUP_FN) - *ret = elem->copy_fn.type_copy_fn(datatype, it.first, elem->extra_state, it.second, &value_out, &flag); + ret = elem->copy_fn.type_copy_fn(datatype, it.first, elem->extra_state, it.second, &value_out, &flag); else if ( elem->copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN && (*(int*)*elem->copy_fn.type_copy_fn_fort) != 1){ value_out=(int*)xbt_malloc(sizeof(int)); - elem->copy_fn.type_copy_fn_fort(datatype, it.first, elem->extra_state, it.second, value_out, &flag,ret); + elem->copy_fn.type_copy_fn_fort(datatype, it.first, elem->extra_state, it.second, value_out, &flag, &ret); } - if (*ret != MPI_SUCCESS) { + if (ret != MPI_SUCCESS) { break; } if(elem->copy_fn.type_copy_fn == MPI_TYPE_DUP_FN || @@ -160,27 +185,19 @@ Datatype::Datatype(Datatype *datatype, int* ret) : name_(nullptr), size_(datatyp } } } + delete contents_; + contents_ = new Datatype_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype); + return ret; } -Datatype::~Datatype(){ - xbt_assert(refcount_ >= 0); - - if(flags_ & DT_FLAG_PREDEFINED) - return; - - //if still used, mark for deletion - if(refcount_!=0){ - flags_ |=DT_FLAG_DESTROYED; - return; - } - - cleanup_attr(); - - xbt_free(name_); +int Datatype::clone(MPI_Datatype* type){ + int ret; + *type = new Datatype(this, &ret); + return ret; } -void Datatype::ref(){ - +void Datatype::ref() +{ refcount_++; #if SIMGRID_HAVE_MC @@ -208,16 +225,17 @@ void Datatype::commit() flags_ |= DT_FLAG_COMMITED; } -bool Datatype::is_valid(){ +bool Datatype::is_valid() const +{ return (flags_ & DT_FLAG_COMMITED); } -bool Datatype::is_basic() +bool Datatype::is_basic() const { return (flags_ & DT_FLAG_BASIC); } -bool Datatype::is_replayable() +bool Datatype::is_replayable() const { return (simgrid::instr::trace_format == simgrid::instr::TraceFormat::Ti) && ((this == MPI_BYTE) || (this == MPI_DOUBLE) || (this == MPI_INT) || (this == MPI_CHAR) || @@ -233,15 +251,21 @@ void Datatype::addflag(int flag){ flags_ &= flag; } -int Datatype::extent(MPI_Aint * lb, MPI_Aint * extent){ +int Datatype::extent(MPI_Aint* lb, MPI_Aint* extent) const +{ *lb = lb_; *extent = ub_ - lb_; return MPI_SUCCESS; } -void Datatype::get_name(char* name, int* length){ - *length = strlen(name_); - strncpy(name, name_, *length+1); +void Datatype::get_name(char* name, int* length) const +{ + if(name_!=nullptr){ + *length = strlen(name_); + strncpy(name, name_, *length+1); + }else{ + *length = 0; + } } void Datatype::set_name(const char* name){ @@ -250,7 +274,7 @@ void Datatype::set_name(const char* name){ name_ = xbt_strdup(name); } -int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, MPI_Comm) +int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, const Comm*) { if (outcount - *position < incount*static_cast(size_)) return MPI_ERR_OTHER; @@ -259,7 +283,7 @@ int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, i return MPI_SUCCESS; } -int Datatype::unpack(const void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Comm) +int Datatype::unpack(const void* inbuf, int insize, int* position, void* outbuf, int outcount, const Comm*) { if (outcount*static_cast(size_)> insize) return MPI_ERR_OTHER; @@ -268,29 +292,77 @@ int Datatype::unpack(const void* inbuf, int insize, int* position, void* outbuf, return MPI_SUCCESS; } -int Datatype::copy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype){ +int Datatype::get_contents(int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, + MPI_Aint* array_of_addresses, MPI_Datatype* array_of_datatypes) const +{ + if(contents_==nullptr) + return MPI_ERR_ARG; + if (static_cast(max_integers) < contents_->integers_.size()) + return MPI_ERR_COUNT; + std::copy(begin(contents_->integers_), end(contents_->integers_), array_of_integers); + if (static_cast(max_addresses) < contents_->addresses_.size()) + return MPI_ERR_COUNT; + std::copy(begin(contents_->addresses_), end(contents_->addresses_), array_of_addresses); + if (static_cast(max_datatypes) < contents_->datatypes_.size()) + return MPI_ERR_COUNT; + std::copy(begin(contents_->datatypes_), end(contents_->datatypes_), array_of_datatypes); + std::for_each(begin(contents_->datatypes_), end(contents_->datatypes_), std::mem_fn(&Datatype::ref)); + return MPI_SUCCESS; +} -// FIXME Handle the case of a partial shared malloc. +int Datatype::get_envelope(int* num_integers, int* num_addresses, int* num_datatypes, int* combiner) const +{ + if(contents_==nullptr){ + *num_integers = 0; + *num_addresses = 0; + *num_datatypes = 0; + *combiner = MPI_COMBINER_NAMED; + }else{ + *num_integers = contents_->integers_.size(); + *num_addresses = contents_->addresses_.size(); + *num_datatypes = contents_->datatypes_.size(); + *combiner = contents_->combiner_; + } + return MPI_SUCCESS; +} + +int Datatype::copy(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype) +{ + // FIXME Handle the case of a partial shared malloc. - if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) { smpi_switch_data_segment(simgrid::s4u::Actor::self()); } /* First check if we really have something to do */ + size_t offset = 0; + std::vector> private_blocks; + if(smpi_is_shared(sendbuf,private_blocks,&offset) + && (private_blocks.size()==1 + && (private_blocks[0].second - private_blocks[0].first)==(unsigned long)(sendcount * sendtype->get_extent()))){ + XBT_VERB("sendbuf is shared. Ignoring copies"); + return 0; + } + if(smpi_is_shared(recvbuf,private_blocks,&offset) + && (private_blocks.size()==1 + && (private_blocks[0].second - private_blocks[0].first)==(unsigned long)(recvcount * recvtype->get_extent()))){ + XBT_VERB("recvbuf is shared. Ignoring copies"); + return 0; + } + if (recvcount > 0 && recvbuf != sendbuf) { sendcount *= sendtype->size(); recvcount *= recvtype->size(); int count = sendcount < recvcount ? sendcount : recvcount; XBT_DEBUG("Copying %d bytes from %p to %p", count, sendbuf, recvbuf); if (not(sendtype->flags() & DT_FLAG_DERIVED) && not(recvtype->flags() & DT_FLAG_DERIVED)) { - if (not smpi_process()->replaying()) + if (not smpi_process()->replaying() && count > 0) memcpy(recvbuf, sendbuf, count); } else if (not(sendtype->flags() & DT_FLAG_DERIVED)) { recvtype->unserialize(sendbuf, recvbuf, count / recvtype->size(), MPI_REPLACE); } else if (not(recvtype->flags() & DT_FLAG_DERIVED)) { sendtype->serialize(sendbuf, recvbuf, count / sendtype->size()); - }else{ - + } else { void * buf_tmp = xbt_malloc(count); sendtype->serialize( sendbuf, buf_tmp,count/sendtype->size()); @@ -306,14 +378,14 @@ int Datatype::copy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, //Default serialization method : memcpy. void Datatype::serialize(const void* noncontiguous_buf, void* contiguous_buf, int count) { - char* contiguous_buf_char = static_cast(contiguous_buf); - const char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; + auto* contiguous_buf_char = static_cast(contiguous_buf); + const auto* noncontiguous_buf_char = static_cast(noncontiguous_buf) + lb_; memcpy(contiguous_buf_char, noncontiguous_buf_char, count*size_); } void Datatype::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ - const char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; + const auto* contiguous_buf_char = static_cast(contiguous_buf); + auto* noncontiguous_buf_char = static_cast(noncontiguous_buf) + lb_; int n=count; if(op!=MPI_OP_NULL) op->apply( contiguous_buf_char, noncontiguous_buf_char, &n, this); @@ -351,6 +423,8 @@ int Datatype::create_vector(int count, int block_length, int stride, MPI_Datatyp /* 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); + int ints[3] = {count, block_length, stride}; + (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_VECTOR, 3, ints, 0, nullptr, 1, &old_type); retval=MPI_SUCCESS; } return retval; @@ -375,6 +449,8 @@ int Datatype::create_hvector(int count, int block_length, MPI_Aint stride, MPI_D }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); + int ints[2] = {count, block_length}; + (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_HVECTOR, 2, ints, 1, &stride, 1, &old_type); retval=MPI_SUCCESS; } return retval; @@ -566,11 +642,9 @@ int Datatype::create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, return MPI_SUCCESS; } -Datatype* Datatype::f2c(int id){ +Datatype* Datatype::f2c(int id) +{ return static_cast(F2C::f2c(id)); } - - -} -} - +} // namespace smpi +} // namespace simgrid