Default downstream CUDA/HIP architectures (#1669)

* Default downstream CUDA/HIP architectures

* Docker didn't have a geant4 version number

* Get geant4 version number through the geant4-config script

* Disable MPI in offload test

* Restore posix compatibility

* Update scripts/ci/test-examples.sh

Co-authored-by: Philippe Canal <[email protected]>

* POSIX compliance

---------

Co-authored-by: Philippe Canal <[email protected]>

Author: sethrj

.github/workflows/build-spack.yml

@@ -280,7 +280,6 @@ jobs:
                || !matrix.geant
               ) && '1' || ''
             }}
-          CELER_GEANT4_VERSION: ${{matrix.geant}}
         if: >-
           ${{
             (matrix.special != 'asanlite')

CMakeLists.txt

@@ -713,13 +713,11 @@ foreach(_key
     set(_cache_val "$CACHE{${_key}}")
     if(_cache_val)
       list(APPEND CELERITAS_EXPORT_VARIABLES
-        "set(${_key} \"${_cache_val}\" CACHE PATH \"Set by CeleritasConfig.cmake\")"
+        "_celer_set_cache_default(${_key} \"${_cache_val}\" PATH \"Set by CeleritasConfig.cmake\")"
       )
     else()
     list(APPEND CELERITAS_EXPORT_VARIABLES
-      "if(NOT DEFINED ${_key})"
-      "  set(${_key} \"${_val}\")"
-      "endif()"
+      "_celer_set_local_default(${_key} \"${_val}\")"
     )
   endif()
   endif()

cmake/CeleritasConfig.cmake.in

@@ -29,6 +29,24 @@ if(((@PROJECT_NAME@_FIND_VERSION_MAJOR EQUAL 0
    )
 endif()
 
+#-----------------------------------------------------------------------------#
+# Configuration macros
+#-----------------------------------------------------------------------------#
+
+macro(_celer_set_local_default var val)
+  if(NOT DEFINED ${var})
+    message(VERBOSE "Celeritas: set ${var}=${val}")
+    set(${var} "${val}")
+  endif()
+endmacro()
+
+macro(_celer_set_cache_default var val)
+  if(NOT DEFINED ${var})
+    message(STATUS "Celeritas: set cache ${var}=${val}")
+    set(${var} "${val}" CACHE ${ARGN})
+  endif()
+endmacro()
+
 #-----------------------------------------------------------------------------#
 # Variables
 #-----------------------------------------------------------------------------#
@@ -46,6 +64,13 @@ include(CMakeFindDependencyMacro)
 if(CELERITAS_USE_CUDA)
   find_dependency(CUDAToolkit REQUIRED)
 
+  # Set cache variable if needed *before* checking CUDA
+  _celer_set_cache_default(
+    CMAKE_CUDA_ARCHITECTURES
+    "${CELERITAS_CMAKE_CUDA_ARCHITECTURES}"
+    STRING "CUDA architectures"
+  )
+
   if(NOT CMAKE_CUDA_COMPILER_LOADED)
     # enable_language only really works in top-level CMake directory, not even subprojects
     # https://discourse.cmake.org/t/is-it-appropriate-to-use-enable-language-in-a-cmake-package-file/4335
@@ -65,6 +90,11 @@ if(CELERITAS_USE_CUDA)
     endif()
   endif()
 elseif(CELERITAS_USE_HIP)
+  _celer_set_cache_default(
+    CMAKE_HIP_ARCHITECTURES
+    "${CELERITAS_CMAKE_HIP_ARCHITECTURES}"
+    STRING "HIP architectures"
+  )
   find_dependency(hip REQUIRED QUIET)
 endif()
 

scripts/ci/test-examples.sh

@@ -41,17 +41,26 @@ build_local
 
 # Run Geant4 app examples
 if [ -z "${CELER_DISABLE_ACCEL_EXAMPLES}" ]; then
+  if [ -z "${G4VERSION_NUMBER}" ]; then
+    # Get the geant4 version 11.2.3, failing if config isn't found
+    _vers=$(geant4-config --version)
+    # Replace . with ' ' and convert to MMmp (major/minor/patch)
+    G4VERSION_NUMBER=$(echo "${_vers}" | tr '.' ' ' | xargs printf '%d%01d%01d')
+    echo "Set G4VERSION_NUMBER=\"${G4VERSION_NUMBER}\""
+  fi
+
   # Run small accel examples
   cd "${CELER_SOURCE_DIR}/example/accel"
   build_local
   ctest -V --no-tests=error
 
-  if [ "$(echo $CELER_GEANT4_VERSION | awk -F. '{print $1*100 + $2}')" \
-      -ge 1100 ]; then
+  if [ "${G4VERSION_NUMBER}" -ge 1100 ]; then
     # Run offload-template only on Geant4 v11
     cd "${CELER_SOURCE_DIR}/example/offload-template"
     build_local
-    ./run-offload
+    CELER_DISABLE_PARALLEL=1 \
+      G4FORCENUMBEROFTHREADS=4 G4RUN_MANAGER_TYPE=MT \
+      ./run-offload
   fi
 else
   printf "\e[31mSkipping 'accel' tests due to insufficient requirements\e[m\n"