Switched back to using axom~shared+cuda or axom+shared~cuda, added gu…

…ards to prevent overwriting caliper directory used for exporting
LLNL · Sep 11, 2024 · 53e3eb0 · 53e3eb0
1 parent a133ba3
commit 53e3eb0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cmake/InstallTPLs.cmake b/cmake/InstallTPLs.cmake
@@ -101,7 +101,10 @@ message("-----------------------------------------------------------------------
 # Use find_package to get caliper
 if (ENABLE_TIMER)
   # Save caliper_DIR because it gets overwritten by find_package
-  set(CONFIG_CALIPER_DIR "${caliper_DIR}" CACHE PATH "Configuration Caliper directory")
+  if(NOT CONFIG_CALIPER_DIR)
+    # Only save if it does not exists already
+    set(CONFIG_CALIPER_DIR "${caliper_DIR}" CACHE PATH "Configuration Caliper directory")
+  endif()
   find_package(caliper REQUIRED NO_DEFAULT_PATH PATHS ${caliper_DIR}/share/cmake/caliper)
   if(caliper_FOUND)
     list(APPEND SPHERAL_BLT_DEPENDS caliper)

diff --git a/scripts/spack/packages/spheral/package.py b/scripts/spack/packages/spheral/package.py
@@ -50,7 +50,9 @@ class Spheral(CachedCMakePackage, CudaPackage):
     # Zlib fix has been merged into conduit, using develop until next release.
     depends_on('conduit@0.9.1 +shared +hdf5~hdf5_compat -test ~parmetis', type='build')
     depends_on('conduit +hdf5', type='build', when='^hdf5@1.8.0:1.8')
-    depends_on('axom@0.9.0 +shared +hdf5 -lua -examples -python -fortran', type='build')
+    depends_on('axom@0.9.0 +hdf5 -lua -examples -python -fortran', type='build')
+    depends_on('axom +shared', when='~cuda', type='build')
+    depends_on('axom ~shared', when='+cuda', type='build')
     depends_on('caliper@2.11 ~shared +adiak +gotcha ~libdw ~papi ~libunwind +pic', type='build')
     mpi_tpl_list = ["hdf5", "conduit", "axom", "caliper", "adiak~shared"]
     for ctpl in mpi_tpl_list:

diff --git a/src/SimulationControl/SpheralOptionParser.py b/src/SimulationControl/SpheralOptionParser.py
@@ -68,7 +68,7 @@ def InitTimers(caliper_config, filename):
         TimerMgr.add(caliper_config)
         TimerMgr.start()
     else:
-        import random, os, sys
+        import os, sys
         if (filename):
             testname = filename
         else: