Add IPC job without MPI (#847)

LLNL · Sep 22, 2023 · 20839b2 · 20839b2
1 parent 1a3a7d0
commit 20839b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.gitlab/ruby-build-and-test-extra.yml b/.gitlab/ruby-build-and-test-extra.yml
@@ -47,6 +47,11 @@ gcc_10_3_1_tpls:
     SPEC: "~shared +fortran +tools tests=basic %gcc@10.3.1"
   extends: .build_and_test_on_ruby
 
+gcc_10_3_1_ipc_no_mpi:
+  variables:
+    SPEC: "~shared +ipc_shmem tests=basic %gcc@10.3.1"
+  extends: .build_and_test_on_ruby
+
 # Oneapi is not available on ruby@toss4 (rhel8)
 ## We deactivate this job as it is known to fail with Umpire: needs gcc toolchain.
 #intel_2022_1_0:

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
diff --git a/tests/unit/resource/CMakeLists.txt b/tests/unit/resource/CMakeLists.txt
@@ -26,7 +26,7 @@ if(UMPIRE_ENABLE_FILE_RESOURCE)
     COMMAND file_resource_tests)
 endif()
 
-if(UMPIRE_ENABLE_IPC_SHARED_MEMORY)
+if(UMPIRE_ENABLE_IPC_SHARED_MEMORY AND UMPIRE_ENABLE_MPI)
   blt_add_executable(
     NAME shared_memory_resource_tests
     SOURCES shared_memory_resource_tests.cpp

diff --git a/umpire-config.cmake.in b/umpire-config.cmake.in
@@ -14,12 +14,12 @@ if (@UMPIRE_NEEDS_BLT_TPLS@)
   include("${BLT_TGTS}")
   endif()
   unset(BLT_TGTS)
-
-  if (@UMPIRE_ENABLE_CUDA@ OR @UMPIRE_ENABLE_MPI@)
-    find_dependency(Threads)
-  endif ()
 endif()
 
+if (@UMPIRE_ENABLE_CUDA@ OR @UMPIRE_ENABLE_MPI@ OR @UMPIRE_ENABLE_IPC_SHARED_MEMORY@)
+  find_dependency(Threads)
+endif ()
+
 if (NOT TARGET camp)
   set(UMPIRE_CAMP_DIR "@camp_DIR@")
   if(NOT camp_DIR)