/* smpi_datatype.cpp -- MPI primitives to handle datatypes */
-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2022. 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. */
#include <array>
#include <functional>
#include <string>
+#include <complex>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI (datatype)");
static std::unordered_map<std::string, simgrid::smpi::Datatype*> 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 */ \
+#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 */ \
- ); \
- const MPI_Datatype name = &_XBT_CONCAT(mpi_, name);
+ DT_FLAG_BASIC | flag /* flags */ \
+ );
#define CREATE_MPI_DATATYPE_NULL(name, id) \
- static simgrid::smpi::Datatype _XBT_CONCAT(mpi_, name)((char*)_XBT_STRINGIFY(name), (id), 0, /* size */ \
+ simgrid::smpi::Datatype _XBT_CONCAT(smpi_MPI_, name)((char*)"MPI_"#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_NULL(DATATYPE_NULL, -1)
+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<float>, DT_FLAG_COMPLEX)
+CREATE_MPI_DATATYPE(CXX_DOUBLE_COMPLEX, 53, std::complex<double>, DT_FLAG_COMPLEX)
+CREATE_MPI_DATATYPE(CXX_LONG_DOUBLE_COMPLEX, 54, std::complex<long double>, 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(MPI_PTR, 54, void*)
-CREATE_MPI_DATATYPE(MPI_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;
namespace simgrid{
Datatype::Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags) : size_(size), lb_(lb), ub_(ub), flags_(flags)
{
+ this->add_f();
#if SIMGRID_HAVE_MC
if(MC_is_active())
- MC_ignore(&(refcount_), sizeof(refcount_));
+ MC_ignore(&refcount_, sizeof refcount_);
#endif
}
// for predefined types, so refcount_ = 0.
-Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags)
+Datatype::Datatype(const 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)
{
id2type_lookup.insert({id, this});
#if SIMGRID_HAVE_MC
if(MC_is_active())
- MC_ignore(&(refcount_), sizeof(refcount_));
+ MC_ignore(&refcount_, sizeof refcount_);
#endif
}
Datatype::Datatype(Datatype* datatype, int* ret)
- : size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_)
+ : size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_), duplicated_datatype_(datatype)
{
+ this->add_f();
+ datatype->ref();
*ret = this->copy_attrs(datatype);
}
if(flags_ & DT_FLAG_PREDEFINED)
return;
-
+ //prevent further usage
+ flags_ &= ~ DT_FLAG_COMMITED;
+ if(duplicated_datatype_ != MPI_DATATYPE_NULL)
+ unref(duplicated_datatype_);
+ F2C::free_f(this->f2c_id());
//if still used, mark for deletion
if(refcount_!=0){
flags_ |=DT_FLAG_DESTROYED;
return;
}
-
cleanup_attr<Datatype>();
- delete contents_;
- xbt_free(name_);
}
int Datatype::copy_attrs(Datatype* datatype){
flags_ &= ~DT_FLAG_PREDEFINED;
- int ret = MPI_SUCCESS;
-
- if (not datatype->attributes()->empty()) {
- int flag=0;
- void* value_out;
- for (auto const& it : *(datatype->attributes())) {
- smpi_key_elem elem = keyvals_.at(it.first);
- 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);
- 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);
- }
- if (ret != MPI_SUCCESS) {
- break;
- }
- if(elem->copy_fn.type_copy_fn == MPI_TYPE_DUP_FN ||
- ((elem->copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN) && (*(int*)*elem->copy_fn.type_copy_fn_fort == 1))){
- elem->refcount++;
- attributes()->insert({it.first, it.second});
- } else if (flag){
- elem->refcount++;
- attributes()->insert({it.first, value_out});
- }
+
+ set_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype);
+ for (auto const& it : datatype->attributes()) {
+ auto elem_it = keyvals_.find(it.first);
+ xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Datatype: %d", it.first);
+
+ smpi_key_elem& elem = elem_it->second;
+ int ret = MPI_SUCCESS;
+ int flag = 0;
+ void* value_out = nullptr;
+ if (elem.copy_fn.type_copy_fn == MPI_TYPE_DUP_FN) {
+ value_out = it.second;
+ flag = 1;
+ } else if (elem.copy_fn.type_copy_fn != MPI_NULL_COPY_FN) {
+ ret = elem.copy_fn.type_copy_fn(datatype, it.first, elem.extra_state, it.second, &value_out, &flag);
+ }
+ if (ret != MPI_SUCCESS)
+ return ret;
+
+ if (elem.copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN) {
+ value_out = xbt_new(int, 1);
+ if (*(int*)*elem.copy_fn.type_copy_fn_fort == 1) { // MPI_TYPE_DUP_FN
+ memcpy(value_out, it.second, sizeof(int));
+ flag = 1;
+ } else { // not null, nor dup
+ elem.copy_fn.type_copy_fn_fort(datatype, it.first, elem.extra_state, it.second, value_out, &flag, &ret);
+ }
+ if (ret != MPI_SUCCESS) {
+ xbt_free(value_out);
+ return ret;
}
}
+ if (flag) {
+ elem.refcount++;
+ attributes().emplace(it.first, value_out);
+ }
}
- delete contents_;
- contents_ = new Datatype_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype);
- return ret;
+ return MPI_SUCCESS;
}
int Datatype::clone(MPI_Datatype* type){
#if SIMGRID_HAVE_MC
if(MC_is_active())
- MC_ignore(&(refcount_), sizeof(refcount_));
+ MC_ignore(&refcount_, sizeof refcount_);
#endif
}
if (datatype->refcount_ > 0)
datatype->refcount_--;
- if (datatype->refcount_ == 0 && not(datatype->flags_ & DT_FLAG_PREDEFINED))
- delete 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))
+ delete datatype;
}
void Datatype::commit()
return (flags_ & DT_FLAG_BASIC);
}
-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) ||
- (this == MPI_SHORT) || (this == MPI_LONG) || (this == MPI_FLOAT));
-}
-
MPI_Datatype Datatype::decode(const std::string& datatype_id)
{
return id2type_lookup.find(datatype_id)->second;
void Datatype::get_name(char* name, int* length) const
{
- if(name_!=nullptr){
- *length = strlen(name_);
- strncpy(name, name_, *length+1);
- }else{
- *length = 0;
+ *length = static_cast<int>(name_.length());
+ if (not name_.empty()) {
+ name_.copy(name, *length);
+ name[*length] = '\0';
}
}
-void Datatype::set_name(const char* name){
- if(name_!=nullptr && (flags_ & DT_FLAG_PREDEFINED) == 0)
- xbt_free(name_);
- name_ = xbt_strdup(name);
+void Datatype::set_name(const char* name)
+{
+ name_ = name;
}
int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, const Comm*)
if (static_cast<unsigned>(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));
+ for (auto& datatype : contents_->datatypes_)
+ datatype->ref();
return MPI_SUCCESS;
}
{
// FIXME Handle the case of a partial shared malloc.
- if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) {
- smpi_switch_data_segment(simgrid::s4u::Actor::self());
- }
+ smpi_switch_data_segment(simgrid::s4u::Actor::self());
+
/* First check if we really have something to do */
size_t offset = 0;
std::vector<std::pair<size_t, size_t>> private_blocks;
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 if(sendtype->size() != 0 && recvtype->size() != 0){
void * buf_tmp = xbt_malloc(count);
-
sendtype->serialize( sendbuf, buf_tmp,count/sendtype->size());
recvtype->unserialize( buf_tmp, recvbuf,count/recvtype->size(), MPI_REPLACE);
-
xbt_free(buf_tmp);
}
}
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(old_type->size() * block_length * count, 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);
+ *new_type =
+ new Datatype(old_type->size() * block_length * count, 0,
+ old_type->size() * ((count - 1) * stride + block_length), DT_FLAG_CONTIGUOUS | DT_FLAG_DERIVED);
const std::array<int, 3> 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;
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(old_type->size() * block_length * count, 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);
+ *new_type = new Datatype(old_type->size() * block_length * count, 0, old_type->size() * block_length * count,
+ DT_FLAG_CONTIGUOUS | DT_FLAG_DERIVED);
const std::array<int, 2> 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;
if(indices[i]+block_lengths[i]*old_type->ub()>ub)
ub = indices[i]+block_lengths[i]*old_type->ub();
- if ( (i< count -1) && (indices[i]+block_lengths[i]*(static_cast<int>(old_type->size())) != indices[i+1]) )
+ if ((i < count - 1) && (indices[i] + static_cast<MPI_Aint>(old_type->size()) * block_lengths[i] != indices[i + 1]))
contiguous=false;
}
if (old_type->flags_ & DT_FLAG_DERIVED || lb!=0)
if (not forced_ub && indices[i] + block_lengths[i] * old_types[i]->ub() > ub)
ub = indices[i]+block_lengths[i]*old_types[i]->ub();
- if ( (i< count -1) && (indices[i]+block_lengths[i]*static_cast<int>(old_types[i]->size()) != indices[i+1]) )
+ if ((i < count - 1) &&
+ (indices[i] + static_cast<MPI_Aint>(old_types[i]->size() * block_lengths[i]) != indices[i + 1]))
contiguous=false;
}
if (not contiguous) {
{
return static_cast<Datatype*>(F2C::f2c(id));
}
+
} // namespace smpi
} // namespace simgrid
