From 2b4dcee56b147273d7e7c0c8c2b376c0297aa594 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 25 Jul 2019 01:13:33 +0200 Subject: [PATCH] take care of some C/Fortran discrepancies --- src/smpi/bindings/smpi_f77_type.cpp | 38 ++++++++++++++----- src/smpi/include/private.hpp | 10 ++--- .../smpi/mpich3-test/f77/datatype/testlist | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/smpi/bindings/smpi_f77_type.cpp b/src/smpi/bindings/smpi_f77_type.cpp index 307bf6a2c3..f59b92d9bb 100644 --- a/src/smpi/bindings/smpi_f77_type.cpp +++ b/src/smpi/bindings/smpi_f77_type.cpp @@ -131,29 +131,41 @@ void mpi_type_create_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* } } -void mpi_type_hindexed_ (int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr) { +void mpi_type_hindexed_ (int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr) { MPI_Datatype tmp; - *ierr = MPI_Type_hindexed(*count, blocklens, indices, simgrid::smpi::Datatype::f2c(*old_type), &tmp); + MPI_Aint* indices_aint=new MPI_Aint[*count]; + for(int i=0; i<*count; i++) + indices_aint[i]=indices[i]; + *ierr = MPI_Type_hindexed(*count, blocklens, indices_aint, simgrid::smpi::Datatype::f2c(*old_type), &tmp); if(*ierr == MPI_SUCCESS) { *newtype = tmp->add_f(); } + delete[] indices_aint; } -void mpi_type_create_hindexed_(int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr){ +void mpi_type_create_hindexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr){ MPI_Datatype tmp; - *ierr = MPI_Type_create_hindexed(*count, blocklens, indices, simgrid::smpi::Datatype::f2c(*old_type), &tmp); + MPI_Aint* indices_aint=new MPI_Aint[*count]; + for(int i=0; i<*count; i++) + indices_aint[i]=indices[i]; + *ierr = MPI_Type_create_hindexed(*count, blocklens, indices_aint, simgrid::smpi::Datatype::f2c(*old_type), &tmp); if(*ierr == MPI_SUCCESS) { *newtype = tmp->add_f(); } + delete[] indices_aint; } -void mpi_type_create_hindexed_block_ (int* count, int* blocklength, MPI_Aint* indices, int* old_type, int* newtype, +void mpi_type_create_hindexed_block_ (int* count, int* blocklength, int* indices, int* old_type, int* newtype, int* ierr) { MPI_Datatype tmp; - *ierr = MPI_Type_create_hindexed_block(*count, *blocklength, indices, simgrid::smpi::Datatype::f2c(*old_type), &tmp); + MPI_Aint* indices_aint=new MPI_Aint[*count]; + for(int i=0; i<*count; i++) + indices_aint[i]=indices[i]; + *ierr = MPI_Type_create_hindexed_block(*count, *blocklength, indices_aint, simgrid::smpi::Datatype::f2c(*old_type), &tmp); if(*ierr == MPI_SUCCESS) { *newtype = tmp->add_f(); } + delete[] indices_aint; } void mpi_type_indexed_ (int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr) { @@ -181,32 +193,38 @@ void mpi_type_create_indexed_block_ (int* count, int* blocklength, int* indices, } } -void mpi_type_struct_ (int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr) { +void mpi_type_struct_ (int* count, int* blocklens, int* indices, int* old_types, int* newtype, int* ierr) { MPI_Datatype tmp; int i=0; MPI_Datatype* types = static_cast(xbt_malloc(*count*sizeof(MPI_Datatype))); + MPI_Aint* indices_aint=new MPI_Aint[*count]; for(i=0; i< *count; i++){ + indices_aint[i]=indices[i]; types[i] = simgrid::smpi::Datatype::f2c(old_types[i]); } - *ierr = MPI_Type_struct(*count, blocklens, indices, types, &tmp); + *ierr = MPI_Type_struct(*count, blocklens, indices_aint, types, &tmp); if(*ierr == MPI_SUCCESS) { *newtype = tmp->add_f(); } xbt_free(types); + delete[] indices_aint; } -void mpi_type_create_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr){ +void mpi_type_create_struct_(int* count, int* blocklens, int* indices, int* old_types, int* newtype, int* ierr){ MPI_Datatype tmp; int i=0; MPI_Datatype* types = static_cast(xbt_malloc(*count*sizeof(MPI_Datatype))); + MPI_Aint* indices_aint=new MPI_Aint[*count]; for(i=0; i< *count; i++){ + indices_aint[i]=indices[i]; types[i] = simgrid::smpi::Datatype::f2c(old_types[i]); } - *ierr = MPI_Type_create_struct(*count, blocklens, indices, types, &tmp); + *ierr = MPI_Type_create_struct(*count, blocklens, indices_aint, types, &tmp); if(*ierr == MPI_SUCCESS) { *newtype = tmp->add_f(); } xbt_free(types); + delete[] indices_aint; } void mpi_pack_ (void* inbuf, int* incount, int* type, void* outbuf, int* outcount, int* position, int* comm, int* ierr) { diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 9b276231ac..32f9d3a71e 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -360,15 +360,15 @@ void mpi_pack_external_(char* datarep, void* inbuf, int* incount, int* datatype, MPI_Aint* position, int* ierr); void mpi_unpack_external_(char* datarep, void* inbuf, MPI_Aint* insize, MPI_Aint* position, void* outbuf, int* outcount, int* datatype, int* ierr); -void mpi_type_hindexed_(int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr); -void mpi_type_create_hindexed_(int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr); -void mpi_type_create_hindexed_block_(int* count, int* blocklength, MPI_Aint* indices, int* old_type, int* newtype, +void mpi_type_hindexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_hindexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_hindexed_block_(int* count, int* blocklength, int* indices, int* old_type, int* newtype, int* ierr); void mpi_type_indexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); void mpi_type_create_indexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); void mpi_type_create_indexed_block_(int* count, int* blocklength, int* indices, int* old_type, int* newtype, int* ierr); -void mpi_type_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr); -void mpi_type_create_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr); +void mpi_type_struct_(int* count, int* blocklens, int* indices, int* old_types, int* newtype, int* ierr); +void mpi_type_create_struct_(int* count, int* blocklens, int* indices, int* old_types, int* newtype, int* ierr); void mpi_ssend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* ierr); void mpi_ssend_init_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); void mpi_intercomm_create_(int* local_comm, int* local_leader, int* peer_comm, int* remote_leader, int* tag, diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/testlist b/teshsuite/smpi/mpich3-test/f77/datatype/testlist index a9e8dcd6d2..fe7afa539a 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/testlist +++ b/teshsuite/smpi/mpich3-test/f77/datatype/testlist @@ -7,5 +7,5 @@ typesubf 1 #packef 1 gaddressf 1 #allctypesf 1 -#hindex1f 1 +hindex1f 1 #hindexed_blockf 1 mpiversion=3.0 -- 2.20.1