From 45b94785162b778ef5f4796d60abd083a56c41cb Mon Sep 17 00:00:00 2001 From: Martti Louhivuori Date: Tue, 5 Sep 2023 14:31:58 +0300 Subject: [PATCH] Use named MPI datatypes for C++ datatypes MPI datatypes using the namespace syntax (MPI::BOOL etc.) were deprecated in MPI-3.0 and replaced with corresponding named MPI datatypes. --- src/interface/common.cxx | 4 ---- src/interface/set.cxx | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/interface/common.cxx b/src/interface/common.cxx index df88ba85..4c5bf01e 100644 --- a/src/interface/common.cxx +++ b/src/interface/common.cxx @@ -4,10 +4,6 @@ #include "../shared/util.h" #include -#ifdef USE_MPI_CPP -#define MPI_CXX_DOUBLE_COMPLEX MPI::DOUBLE_COMPLEX -#endif - namespace CTF_int { int64_t computed_flop_count = 0; diff --git a/src/interface/set.cxx b/src/interface/set.cxx index 28ccfabf..4ba4f090 100644 --- a/src/interface/set.cxx +++ b/src/interface/set.cxx @@ -6,15 +6,9 @@ namespace CTF_int { -#ifdef USE_MPI_CPP - MPI_Datatype MPI_CTF_BOOL = MPI::BOOL; - MPI_Datatype MPI_CTF_DOUBLE_COMPLEX = MPI::DOUBLE_COMPLEX; - MPI_Datatype MPI_CTF_LONG_DOUBLE_COMPLEX = MPI::LONG_DOUBLE_COMPLEX; -#else MPI_Datatype MPI_CTF_BOOL = MPI_CXX_BOOL; MPI_Datatype MPI_CTF_DOUBLE_COMPLEX = MPI_CXX_DOUBLE_COMPLEX; MPI_Datatype MPI_CTF_LONG_DOUBLE_COMPLEX = MPI_CXX_LONG_DOUBLE_COMPLEX; -#endif #if USE_MKL void def_coo_to_csr_fl(int64_t nz, int nrow, float * csr_vs, int * csr_ja, int * csr_ia, float * coo_vs, int * coo_rs, int * coo_cs, bool to_csr){