X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..6d004c352f7b26fba38486001f874e65466b5bee:/src/smpi/mpi/smpi_datatype_derived.cpp diff --git a/src/smpi/mpi/smpi_datatype_derived.cpp b/src/smpi/mpi/smpi_datatype_derived.cpp index 3be87a2df3..9b1140dc2a 100644 --- a/src/smpi/mpi/smpi_datatype_derived.cpp +++ b/src/smpi/mpi/smpi_datatype_derived.cpp @@ -1,5 +1,5 @@ /* smpi_datatype.cpp -- MPI primitives to handle datatypes */ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -8,86 +8,38 @@ #include "smpi_op.hpp" #include -XBT_LOG_EXTERNAL_CATEGORY(smpi_datatype); +#include namespace simgrid{ namespace smpi{ - -Type_Contiguous::Type_Contiguous(int size, MPI_Aint lb, MPI_Aint ub, int flags, int block_count, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(block_count), old_type_(old_type){ +Type_Contiguous::Type_Contiguous(int size, MPI_Aint lb, MPI_Aint ub, int flags, int block_count, MPI_Datatype old_type) + : Datatype(size, lb, ub, flags), block_count_(block_count), old_type_(old_type) +{ old_type_->ref(); } -Type_Contiguous::~Type_Contiguous(){ +Type_Contiguous::~Type_Contiguous() +{ Datatype::unref(old_type_); } - -void Type_Contiguous::serialize( void* noncontiguous_buf, void *contiguous_buf, - int count){ +void Type_Contiguous::serialize(const void* noncontiguous_buf, void* contiguous_buf, int count) +{ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb(); + const char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb(); memcpy(contiguous_buf_char, noncontiguous_buf_char, count * block_count_ * old_type_->size()); } -void Type_Contiguous::unserialize( void* contiguous_buf, void *noncontiguous_buf, - int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); + +void Type_Contiguous::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(); int n= count*block_count_; if(op!=MPI_OP_NULL) op->apply( contiguous_buf_char, noncontiguous_buf_char, &n, old_type_); } - -Type_Vector::Type_Vector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int block_length, int stride, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), block_length_(block_length),block_stride_(stride), old_type_(old_type){ - old_type_->ref(); -} - -Type_Vector::~Type_Vector(){ - Datatype::unref(old_type_); -} - - -void Type_Vector::serialize( void* noncontiguous_buf, void *contiguous_buf, - int count){ - char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf); - - for (int i = 0; i < block_count_ * count; i++) { - if (not(old_type_->flags() & DT_FLAG_DERIVED)) - memcpy(contiguous_buf_char, noncontiguous_buf_char, block_length_ * old_type_->size()); - else - old_type_->serialize(noncontiguous_buf_char, contiguous_buf_char, block_length_); - - contiguous_buf_char += block_length_*old_type_->size(); - if((i+1)%block_count_ ==0) - noncontiguous_buf_char += block_length_*old_type_->get_extent(); - else - noncontiguous_buf_char += block_stride_*old_type_->get_extent(); - } -} - -void Type_Vector::unserialize( void* contiguous_buf, void *noncontiguous_buf, - int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf); - - for (int i = 0; i < block_count_ * count; i++) { - if (not(old_type_->flags() & DT_FLAG_DERIVED)) { - if(op != MPI_OP_NULL) - op->apply(contiguous_buf_char, noncontiguous_buf_char, &block_length_, - old_type_); - }else - old_type_->unserialize(contiguous_buf_char, noncontiguous_buf_char, block_length_, op); - - contiguous_buf_char += block_length_*old_type_->size(); - if((i+1)%block_count_ ==0) - noncontiguous_buf_char += block_length_*old_type_->get_extent(); - else - noncontiguous_buf_char += block_stride_*old_type_->get_extent(); - } -} - Type_Hvector::Type_Hvector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int block_length, MPI_Aint stride, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), block_length_(block_length), block_stride_(stride), old_type_(old_type){ old_type->ref(); } @@ -95,10 +47,10 @@ Type_Hvector::~Type_Hvector(){ Datatype::unref(old_type_); } -void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf, +void Type_Hvector::serialize(const void* noncontiguous_buf, void *contiguous_buf, int count){ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf); + const char* noncontiguous_buf_char = static_cast(noncontiguous_buf); for (int i = 0; i < block_count_ * count; i++) { if (not(old_type_->flags() & DT_FLAG_DERIVED)) @@ -114,10 +66,9 @@ void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf, } } - -void Type_Hvector::unserialize( void* contiguous_buf, void *noncontiguous_buf, +void Type_Hvector::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); + const char* contiguous_buf_char = static_cast(contiguous_buf); char* noncontiguous_buf_char = static_cast(noncontiguous_buf); for (int i = 0; i < block_count_ * count; i++) { @@ -134,86 +85,40 @@ void Type_Hvector::unserialize( void* contiguous_buf, void *noncontiguous_buf, } } -Type_Indexed::Type_Indexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int* block_lengths, int* block_indices, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type){ - old_type->ref(); - block_lengths_ = new int[count]; - block_indices_ = new int[count]; - for (int i = 0; i < count; i++) { - block_lengths_[i]=block_lengths[i]; - block_indices_[i]=block_indices[i]; - } -} - -Type_Indexed::~Type_Indexed(){ - Datatype::unref(old_type_); - if(refcount()==0){ - delete[] block_lengths_; - delete[] block_indices_; - } -} - - -void Type_Indexed::serialize( void* noncontiguous_buf, void *contiguous_buf, - int count){ - char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+block_indices_[0] * old_type_->size(); - for (int j = 0; j < count; j++) { - for (int i = 0; i < block_count_; i++) { - if (not(old_type_->flags() & DT_FLAG_DERIVED)) - memcpy(contiguous_buf_char, noncontiguous_buf_char, block_lengths_[i] * old_type_->size()); - else - old_type_->serialize( noncontiguous_buf_char, contiguous_buf_char, block_lengths_[i]); - - contiguous_buf_char += block_lengths_[i]*old_type_->size(); - if (i(noncontiguous_buf) + block_indices_[i+1]*old_type_->get_extent(); - else - noncontiguous_buf_char += block_lengths_[i]*old_type_->get_extent(); - } - noncontiguous_buf=static_cast< void*>(noncontiguous_buf_char); - } +Type_Vector::Type_Vector(int size, MPI_Aint lb, MPI_Aint ub, int flags, int count, int block_length, int stride, + MPI_Datatype old_type) + : Type_Hvector(size, lb, ub, flags, count, block_length, stride * old_type->get_extent(), old_type) +{ } - -void Type_Indexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, - int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = - static_cast(noncontiguous_buf)+block_indices_[0]*old_type_->get_extent(); - for (int j = 0; j < count; j++) { - for (int i = 0; i < block_count_; i++) { - if (not(old_type_->flags() & DT_FLAG_DERIVED)) { - if(op!=MPI_OP_NULL) - op->apply( contiguous_buf_char, noncontiguous_buf_char, &block_lengths_[i], - old_type_); - }else - old_type_->unserialize( contiguous_buf_char,noncontiguous_buf_char,block_lengths_[i], op); - - contiguous_buf_char += block_lengths_[i]*old_type_->size(); - if (i(noncontiguous_buf) + block_indices_[i+1]*old_type_->get_extent(); - else - noncontiguous_buf_char += block_lengths_[i]*old_type_->get_extent(); - } - noncontiguous_buf=static_cast(noncontiguous_buf_char); +Type_Hindexed::Type_Hindexed(int size, MPI_Aint lb, MPI_Aint ub, int flags, int count, const int* block_lengths, + const MPI_Aint* block_indices, MPI_Datatype old_type) + : Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type) +{ + old_type_->ref(); + block_lengths_ = new int[count]; + block_indices_ = new MPI_Aint[count]; + for (int i = 0; i < count; i++) { + block_lengths_[i] = block_lengths[i]; + block_indices_[i] = block_indices[i]; } } -Type_Hindexed::Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int* block_lengths, MPI_Aint* block_indices, MPI_Datatype old_type) -: Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type) +Type_Hindexed::Type_Hindexed(int size, MPI_Aint lb, MPI_Aint ub, int flags, int count, const int* block_lengths, + const int* block_indices, MPI_Datatype old_type, MPI_Aint factor) + : Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type) { old_type_->ref(); block_lengths_ = new int[count]; block_indices_ = new MPI_Aint[count]; for (int i = 0; i < count; i++) { - block_lengths_[i]=block_lengths[i]; - block_indices_[i]=block_indices[i]; + block_lengths_[i] = block_lengths[i]; + block_indices_[i] = block_indices[i] * factor; } } - Type_Hindexed::~Type_Hindexed(){ +Type_Hindexed::~Type_Hindexed() +{ Datatype::unref(old_type_); if(refcount()==0){ delete[] block_lengths_; @@ -221,10 +126,11 @@ Type_Hindexed::Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int c } } -void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf, +void Type_Hindexed::serialize(const void* noncontiguous_buf, void *contiguous_buf, int count){ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+ block_indices_[0]; + const char* noncontiguous_buf_iter = static_cast(noncontiguous_buf); + const char* noncontiguous_buf_char = noncontiguous_buf_iter + block_indices_[0]; for (int j = 0; j < count; j++) { for (int i = 0; i < block_count_; i++) { if (not(old_type_->flags() & DT_FLAG_DERIVED)) @@ -234,17 +140,17 @@ void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf, contiguous_buf_char += block_lengths_[i]*old_type_->size(); if (i(noncontiguous_buf) + block_indices_[i+1]; + noncontiguous_buf_char = noncontiguous_buf_iter + block_indices_[i+1]; else noncontiguous_buf_char += block_lengths_[i]*old_type_->get_extent(); } - noncontiguous_buf=static_cast(noncontiguous_buf_char); + noncontiguous_buf_iter=noncontiguous_buf_char; } } -void Type_Hindexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, +void Type_Hindexed::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); + const char* contiguous_buf_char = static_cast(contiguous_buf); char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+ block_indices_[0]; for (int j = 0; j < count; j++) { for (int i = 0; i < block_count_; i++) { @@ -265,7 +171,13 @@ void Type_Hindexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, } } -Type_Struct::Type_Struct(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int* block_lengths, MPI_Aint* block_indices, MPI_Datatype* old_types): Datatype(size, lb, ub, flags), block_count_(count), block_lengths_(block_lengths), block_indices_(block_indices), old_types_(old_types){ +Type_Indexed::Type_Indexed(int size, MPI_Aint lb, MPI_Aint ub, int flags, int count, const int* block_lengths, + const int* block_indices, MPI_Datatype old_type) + : Type_Hindexed(size, lb, ub, flags, count, block_lengths, block_indices, old_type, old_type->get_extent()) +{ +} + +Type_Struct::Type_Struct(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, const int* block_lengths, const MPI_Aint* block_indices, const MPI_Datatype* old_types): Datatype(size, lb, ub, flags), block_count_(count){ block_lengths_= new int[count]; block_indices_= new MPI_Aint[count]; old_types_= new MPI_Datatype[count]; @@ -289,10 +201,11 @@ Type_Struct::~Type_Struct(){ } -void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf, +void Type_Struct::serialize(const void* noncontiguous_buf, void *contiguous_buf, int count){ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+ block_indices_[0]; + const char* noncontiguous_buf_iter = static_cast(noncontiguous_buf); + const char* noncontiguous_buf_char = noncontiguous_buf_iter + block_indices_[0]; for (int j = 0; j < count; j++) { for (int i = 0; i < block_count_; i++) { if (not(old_types_[i]->flags() & DT_FLAG_DERIVED)) @@ -303,17 +216,17 @@ void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf, contiguous_buf_char += block_lengths_[i]*old_types_[i]->size(); if (i(noncontiguous_buf) + block_indices_[i+1]; + noncontiguous_buf_char = noncontiguous_buf_iter + block_indices_[i+1]; else //let's hope this is MPI_UB ? noncontiguous_buf_char += block_lengths_[i]*old_types_[i]->get_extent(); } - noncontiguous_buf=static_cast(noncontiguous_buf_char); + noncontiguous_buf_iter=noncontiguous_buf_char; } } -void Type_Struct::unserialize( void* contiguous_buf, void *noncontiguous_buf, +void Type_Struct::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); + const char* contiguous_buf_char = static_cast(contiguous_buf); char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+ block_indices_[0]; for (int j = 0; j < count; j++) { for (int i = 0; i < block_count_; i++) {