EVpath upstream to make NO_RDMA more robust (#4116)

ornladios · Mar 29, 2024 · 4a96483 · 4a96483
1 parent 7bb7dc8
commit 4a96483
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/testing/adios2/engine/bp/TestBPWriteReadMultiblock.cpp b/testing/adios2/engine/bp/TestBPWriteReadMultiblock.cpp
@@ -1971,7 +1971,6 @@ TEST_F(BPWriteReadMultiblockTest, MultiblockPerformDataWrite)
     }
     // Each process would write a 1x8 array and all processes would
     // form a mpiSize * Nx 1D array
-    const std::string fname("MultiblockPerformDataWrite.bp");
 
     int mpiRank = 0, mpiSize = 1;
     // Number of elements per blocks (blocksize)
@@ -1990,8 +1989,10 @@ TEST_F(BPWriteReadMultiblockTest, MultiblockPerformDataWrite)
 
 #if ADIOS2_USE_MPI
     adios2::ADIOS adios(MPI_COMM_WORLD);
+    const std::string fname("MultiblockPerformDataWrite_MPI.bp");
 #else
     adios2::ADIOS adios;
+    const std::string fname("MultiblockPerformDataWrite.bp");
 #endif
     /* Write output */
     {

diff --git a/thirdparty/EVPath/EVPath/CMakeLists.txt b/thirdparty/EVPath/EVPath/CMakeLists.txt
@@ -376,7 +376,7 @@ if (MSVC)
     set(EVPATH_USE_ZPL_ENET FALSE)
 endif()
 if(NOT (DEFINED EVPATH_USE_ZPL_ENET))
-  option(EVPATH_USE_ZPL_ENET "Build the enet transport" "OFF")
+  option(EVPATH_USE_ZPL_ENET "Build the zplenet transport" "OFF")
 endif()
 if(EVPATH_USE_ZPL_ENET)
   set(RUN_ZPL_ENET_TESTS TRUE)
@@ -447,7 +447,7 @@ else()
   option(EVPATH_USE_LIBFABRIC "Build the libfabric transport"
     ${LIBFABRIC_FOUND})
 endif()
-if(LIBFABRIC_FOUND) 
+if(LIBFABRIC_FOUND AND NOT EVPATH_NO_RDMA) 
   if(EVPATH_TRANSPORT_MODULES)
     add_library(cmfabric MODULE cmfabric.c ip_config.c)
     set_target_properties(cmfabric PROPERTIES
@@ -485,7 +485,7 @@ else()
   option(EVPATH_USE_IBVERBS "Build the libfabric transport" ${IBVERBS_FOUND})
 endif()
 set(HAVE_IBVERBS ${IBVERBS_FOUND})
-if(IBVERBS_FOUND)
+if(IBVERBS_FOUND AND NOT EVPATH_NO_RDMA)
   if(BUILD_TESTING)
     if(NOT CMAKE_CROSSCOMPILING)
       message(STATUS "Check MEMLOCK rlimit for IB tests")
@@ -548,7 +548,7 @@ if(IBVERBS_FOUND)
     find_package(NNTI)
     option(EVPATH_USE_NNTI "Build the nnti transport" ${NNTI_FOUND})
   endif()
-  if(NNTI_FOUND)
+  if(NNTI_FOUND AND NOT EVPATH_NO_RDMA)
     if(CercsArch STREQUAL "ppc64")
       set(RUN_NNTI_TESTS FALSE)
     endif()
@@ -571,7 +571,7 @@ if(IBVERBS_FOUND)
     endif()
   endif()
 else()
-  set(EVPATH_USE_NNTI FALSE "Build the nnti transport" FORCE)
+  set(EVPATH_USE_NNTI FALSE CACHE INTERNAL "Build the nnti transport" FORCE)
 endif()
 
 # Install extra find module dependencies