Rationalize SST_HAVE_MPI_DP (#4298)

ornladios · Aug 12, 2024 · c4b6fb6 · c4b6fb6
1 parent 262ec1a
commit c4b6fb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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 */