From 49821c80968a521bf30d0e05261cdc3a29d7ccf0 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Sat, 10 Aug 2024 11:51:33 -0400 Subject: [PATCH] Rationalize SST_HAVE_MPI_DP --- source/adios2/toolkit/sst/CMakeLists.txt | 3 ++- source/adios2/toolkit/sst/dp/dp.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/adios2/toolkit/sst/CMakeLists.txt b/source/adios2/toolkit/sst/CMakeLists.txt index 4a8252eeef..53292f01e6 100644 --- a/source/adios2/toolkit/sst/CMakeLists.txt +++ b/source/adios2/toolkit/sst/CMakeLists.txt @@ -45,7 +45,8 @@ if(ADIOS2_HAVE_ZFP) target_link_libraries(sst PRIVATE zfp::zfp) endif() -if(ADIOS2_SST_BUILD_MPI_DP) +if(ADIOS2_SST_HAVE_MPI_CLIENT_SERVER) + set(SST_HAVE_MPI_DP TRUE) target_sources(sst PRIVATE dp/mpi_dp.c) target_link_libraries(sst PRIVATE MPI::MPI_C) endif() diff --git a/source/adios2/toolkit/sst/dp/dp.c b/source/adios2/toolkit/sst/dp/dp.c index 2071ee18a1..45e9321e26 100644 --- a/source/adios2/toolkit/sst/dp/dp.c +++ b/source/adios2/toolkit/sst/dp/dp.c @@ -24,9 +24,9 @@ extern CP_DP_Interface LoadUcxDP(); #ifdef SST_HAVE_DAOS extern CP_DP_Interface LoadDaosDP(); #endif /* SST_HAVE_LIBFABRIC */ -#ifdef SST_HAVE_MPI +#ifdef SST_HAVE_MPI_DP extern CP_DP_Interface LoadMpiDP(); -#endif /* SST_HAVE_MPI*/ +#endif /* SST_HAVE_MPI_DP */ extern CP_DP_Interface LoadEVpathDP(); typedef struct _DPElement @@ -79,7 +79,7 @@ CP_DP_Interface SelectDP(CP_Services Svcs, void *CP_Stream, struct _SstParams *P List = AddDPPossibility(Svcs, CP_Stream, List, LoadDaosDP(), "daos", Params); #endif /* SST_HAVE_DAOS */ -#ifdef SST_HAVE_MPI +#ifdef SST_HAVE_MPI_DP List = AddDPPossibility(Svcs, CP_Stream, List, LoadMpiDP(), "mpi", Params); #endif /* SST_HAVE_MPI */