Merge remote-tracking branch 'upstream/develop' into ferrari

Author: sethrj

.github/CODEOWNERS

@@ -1,12 +1,9 @@
-#-----------------------------------------------------------------------------#
+#-----------------------------*- codeowners -*--------------------------------#
 # CELERITAS PROJECT CODEOWNERS
 # See discussion in /doc/development/administration.rst .
 # Note that later lines take precedence over earlier ones.
 #-----------------------------------------------------------------------------#
 
-# Default all changes to ping the code lead if not overridden below
-* @celeritas-project/code-lead
-
 #-------------------------------------#
 # Topics
 #-------------------------------------#
@@ -21,26 +18,30 @@
 /cmake/ @sethrj @pcanal
 /scripts/ci/ @sethrj @pcanal
 /scripts/docker/interactive @esseivaju
-/scripts/**/perlmutter.* @esseivaju
+
+# Input definitions
+/*/*/inp/ @sethrj
 
 # Core capabilities
-/src/corecel/ @sethrj
-/src/corecel/random/ @davidsgr @amandalund
-/src/corecel/sys/ @esseivaju
+/*/corecel/ @sethrj
+/*/corecel/random/**/Xorwow* @amandalund
+/*/corecel/random/**/Ranlux* @davidsgr @sethrj
+/*/corecel/sys/ @esseivaju
 
 # Physics
-/src/celeritas/em/ @amandalund @stognini @whokion
-/src/celeritas/field/ @sethrj @whokion
-/src/celeritas/neutron/ @whokion
-/src/celeritas/optical/ @amandalund @hhollenb @Rashika-Gupta @whokion
-/src/celeritas/phys/ @sethrj @amandalund
-/src/celeritas/track/ @amandalund @esseivaju @LSchwiebert
+/*/celeritas/decay/ @amandalund @stognini
+/*/celeritas/em/ @amandalund @stognini @whokion
+/*/celeritas/field/ @sethrj @whokion
+/*/celeritas/neutron/ @whokion
+/*/celeritas/optical/ @amandalund @hhollenb @whokion
+/*/celeritas/phys/ @sethrj @amandalund
+/*/celeritas/track/ @amandalund @esseivaju @LSchwiebert
 
 # Geometry
-/src/orange/ @elliottbiondo @esseivaju @sethrj
-/src/geocel/vg/ @mrguilima @sethrj
+/*/orange/ @elliottbiondo @sethrj
+/*/geocel/vg/ @mrguilima @sethrj
 
 # Integration
-/src/celeritas/g4/ @drbenmorgan @sethrj @stognini @whokion
-/src/celeritas/ext/ @drbenmorgan @sethrj @stognini @whokion
-/src/accel/ @drbenmorgan @esseivaju @rahmans1 @Rashika-Gupta @sethrj @stognini @whokion
+/*/celeritas/g4/ @drbenmorgan @stognini
+/*/celeritas/ext/ @drbenmorgan @stognini
+/*/accel/ @drbenmorgan @esseivaju @rahmans1 @Rashika-Gupta @sethrj @stognini @whokion

.github/workflows/build-docker.yml

@@ -75,7 +75,7 @@ jobs:
       # NOTE: checkout must occur *after* setting up environment for git tags to work
       # NOTE: depth must be enough to include the previous tag
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
         with:
           fetch-depth: 383
           fetch-tags: true
@@ -93,7 +93,10 @@ jobs:
       - name: Build Celeritas
         working-directory: build
         run: |
-          ninja
+          echo "::group::Build verbosely"
+          ninja -v -k0
+          echo "::endgroup::"
+          echo "::notice title=build-size::Build size is $(du -hs . | awk '{print $1}')"
 
       ### TEST ###
 
@@ -129,10 +132,19 @@ jobs:
       ### INSTALL ###
 
       - name: Install Celeritas
+        id: install
         working-directory: build
         run: |
+          echo "::group::Install"
           cmake --install .
+          echo "::endgroup::"
+          cmake --build . --target clean
       - name: Check installation
+        if: >-
+          ${{
+            !cancelled()
+            && steps.install.outcome == 'success'
+          }}
         working-directory: install
         run: |
           for exe in orange-update celer-export-geant \
@@ -144,7 +156,8 @@ jobs:
         # TODO: rocm+ndebug fails to propagate HIP library link
         if: >-
           ${{
-            !(matrix.image == 'ubuntu-rocm' && matrix.buildtype == 'ndebug')
+            steps.install.outcome == 'success'
+            && !(matrix.image == 'ubuntu-rocm' && matrix.buildtype == 'ndebug')
           }}
         run: |
           . /etc/profile

.github/workflows/build-fast.yml

@@ -58,7 +58,7 @@ jobs:
       }}
     steps:
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
 
       ### ENVIRONMENT ###
 
@@ -162,7 +162,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
 
       ### ENVIRONMENT ###
 

.github/workflows/build-spack.yml

@@ -105,7 +105,7 @@ jobs:
     continue-on-error: false
     steps:
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
         with:
           fetch-depth: ${{format('{0}', matrix.special != 'tidy' && 383 || 0)}}
           fetch-tags: true # to get version information
@@ -122,6 +122,7 @@ jobs:
           path: spack-src
       - name: Initialize spack environment
         run: |
+          echo "::notice title=spack-arch::Spack architecture is $(spack arch)"
           sed -e 's/cxxstd=default/cxxstd=${{env.CXXSTD}}/' \
             scripts/ci/spack.yaml > spack.yaml
           if ${{matrix.geometry == 'vecgeom'}}; then
@@ -144,7 +145,9 @@ jobs:
                 && matrix.geant != ''}}; then
             spack -e . add [email protected]
           fi
+          echo "::group::Find compilers"
           spack -vd -e . compiler find --mixed-toolchain
+          echo "::endgroup::"
           # Add the spack ref so that updating spack will reconcretize
           echo "# Concretized with ${{env.SPACK_REF}}" >> spack.yaml
       - name: Cache concretization
@@ -159,7 +162,6 @@ jobs:
         run: |
           spack -e . -v concretize || (
             ERR=$?
-            spack arch
             cat spack.yaml
             exit $ERR
           )
@@ -188,8 +190,6 @@ jobs:
 
       - name: Configure Celeritas
         run: |
-          # NOTE: tags have issues, see https://github.com/actions/checkout/issues/2041
-          git fetch --tags
           ln -fs scripts/cmake-presets/ci-ubuntu-github.json CMakeUserPresets.json
           if ${{matrix.geant == '11.0'}}; then
             # Test overriding of Geant4 environment variables
@@ -244,7 +244,10 @@ jobs:
         working-directory: build
         run: |
           ccache -z
+          echo "::group::Build verbosely"
           ninja -v -k0
+          echo "::endgroup::"
+          echo "::notice title=build-size::Build size is $(du -hs . | awk '{print $1}')"
       - name: Show ccache stats
         if: ${{!cancelled() && steps.installdeps.outcome == 'success'}}
         run: |
@@ -356,7 +359,10 @@ jobs:
           }}
         working-directory: build
         run: |
-          ninja install
+          echo "::group::Install"
+          cmake --install .
+          echo "::endgroup::"
+          ninja clean
       - name: Check installation
         if: >-
           ${{
@@ -372,13 +378,12 @@ jobs:
           ./bin/celer-sim --config
       - name: Build examples
         env:
-          CELER_DISABLE_G4_EXAMPLES: >-
-            ${{(!matrix.geant) && '1' || ''}}
-        # Special clang features require downstream flags that don't propagate
+          CELER_DISABLE_G4_EXAMPLES: ${{(!matrix.geant) && '1' || ''}}
+        # `asanlite` requires downstream flags that don't propagate
         if: >-
           ${{
-            matrix.special != 'asanlite'
-            && matrix.special != 'tidy'
+            steps.install.outcome == 'success'
+            && matrix.special != 'asanlite'
           }}
         run: |
           . ${SPACK_VIEW}/rc

.github/workflows/build-ultralite.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
 
       ### ENVIRONMENT ###
 
@@ -121,7 +121,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
 
       ### ENVIRONMENT ###
 

.github/workflows/deploy-pages.yml

@@ -30,7 +30,7 @@ jobs:
     needs: build-docs
     steps:
       - name: Check out Celeritas doc base
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
         with:
           ref: doc/gh-pages-base
       - uses: actions/setup-python@v5

.github/workflows/doc.yml

@@ -36,16 +36,14 @@ jobs:
             sudo apt-get -y install \
                 cmake graphviz ninja-build doxygen nlohmann-json3-dev
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
         with:
           fetch-depth: 383
           fetch-tags: true
       - name: Configure celeritas
         # Turn warnings into errors only for PRs
         # Disable expensive graphs for PRs also
         run: |
-          # NOTE: tags have issues, see https://github.com/actions/checkout/issues/2041
-          git fetch --tags
           ln -fs scripts/cmake-presets/ci-ubuntu-github.json CMakeUserPresets.json
           mkdir build && cd build
           cmake --preset=${CMAKE_PRESET} --log-level=VERBOSE \
@@ -79,7 +77,7 @@ jobs:
             sudo apt-get -y install \
                 cmake graphviz ninja-build doxygen nlohmann-json3-dev
       - name: Check out Celeritas
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1 (2 Dec 2025)
         with:
           fetch-depth: 383
           fetch-tags: true
@@ -92,13 +90,11 @@ jobs:
             pip install -r scripts/doc-requirements.txt
       - name: Configure celeritas
         run: |
-          # NOTE: tags have issues, see https://github.com/actions/checkout/issues/2041
-          git fetch --tags
           ln -fs scripts/cmake-presets/ci-ubuntu-github.json CMakeUserPresets.json
           mkdir build && cd build
           cmake --preset=${CMAKE_PRESET} --log-level=VERBOSE \
             ${{ github.workflow == 'pull_request'
-             && '-DDOXYGEN_WARN_AS_ERROR="YES" -DCELERITAS_SPHINX_USER_HTML_ARGS="-W;--keep-going"'
+             && '-DDOXYGEN_WARN_AS_ERROR="YES" -DCELERITAS_SPHINX_ARGS="-W;--keep-going"'
              || ''}} \
             ..
       - name: Build documentation

CMakeLists.txt

@@ -421,9 +421,10 @@ if(CELERITAS_USE_ROOT)
   endif()
   # ROOT requirement is due to missing CMake commands in old versions
   find_package(ROOT 6.24 REQUIRED)
-  if(NOT ROOT_CXX_STANDARD STREQUAL CMAKE_CXX_STANDARD)
-    message(WARNING "ROOT C++ standard ${ROOT_CXX_STANDARD} "
-      "does not match current CMake standard ${CMAKE_CXX_STANDARD}: "
+  if(ROOT_CXX_STANDARD AND CMAKE_CXX_STANDARD
+     AND NOT (ROOT_CXX_STANDARD STREQUAL CMAKE_CXX_STANDARD))
+    message(WARNING "ROOT C++ standard (${ROOT_CXX_STANDARD}) "
+      "does not match current CMake standard (${CMAKE_CXX_STANDARD}): "
       "build warnings/errors may result")
   endif()
 endif()

CMakePresets.json

@@ -50,37 +50,55 @@
         "CELERITAS_USE_covfie":  {"type": "BOOL", "value": "OFF"}
       }
     },
+    {
+      "name": ".cuda",
+      "hidden": true,
+      "description": "Enable CUDA",
+      "cacheVariables": {
+        "CELERITAS_USE_CUDA": {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_USE_HIP": {"type": "BOOL",   "value": "OFF"},
+        "CMAKE_CUDA_FLAGS_RELEASE": "-O3 -DNDEBUG",
+        "CMAKE_CUDA_COMPILER_LAUNCHER": {"type": "STRING", "value": "$env{CCACHE_PROGRAM}"}
+      }
+    },
     {
       "name": ".cuda-volta",
       "hidden": true,
-      "description": "Options to enable CUDA 11 on Volta architecture",
+      "description": "Enable CUDA 11 on Volta architecture",
+      "inherits": [".cuda"],
       "cacheVariables": {
-        "CELERITAS_USE_CUDA":       {"type": "BOOL",   "value": "ON"},
         "CMAKE_CUDA_ARCHITECTURES": {"type": "STRING", "value": "70"}
       }
     },
     {
-      "name": ".hip-mi100",
+      "name": ".hip",
       "hidden": true,
-      "description": "Options to enable HIP on AMD MI100",
+      "description": "Enable HIP",
       "cacheVariables": {
-        "CELERITAS_USE_CUDA":       {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_USE_HIP":        {"type": "BOOL",   "value": "ON"},
-        "CMAKE_HIP_ARCHITECTURES":  {"type": "STRING", "value": "gfx908"},
+        "CELERITAS_USE_CUDA": {"type": "BOOL", "value": "OFF"},
+        "CELERITAS_USE_HIP": {"type": "BOOL",   "value": "ON"},
+        "CMAKE_HIP_COMPILER_LAUNCHER": {"type": "STRING", "value": "$env{CCACHE_PROGRAM}"},
         "CMAKE_HIP_FLAGS": "-munsafe-fp-atomics -Wno-#warnings",
+        "CMAKE_HIP_FLAGS_RELEASE": "-O3 -DNDEBUG",
         "CMAKE_HIP_FLAGS_DEBUG": "-g -ggdb -O"
       }
     },
+    {
+      "name": ".hip-mi100",
+      "hidden": true,
+      "description": "Enable HIP on AMD MI100",
+      "inherits": [".hip"],
+      "cacheVariables": {
+        "CMAKE_HIP_ARCHITECTURES":  {"type": "STRING", "value": "gfx908"}
+      }
+    },
     {
       "name": ".hip-mi250",
       "hidden": true,
-      "description": "Options to enable HIP on AMD MI250",
+      "description": "Enable HIP on AMD MI250",
+      "inherits": [".hip"],
       "cacheVariables": {
-        "CELERITAS_USE_CUDA":       {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_USE_HIP":        {"type": "BOOL",   "value": "ON"},
-        "CMAKE_HIP_ARCHITECTURES":  {"type": "STRING", "value": "gfx90a"},
-        "CMAKE_HIP_FLAGS": "-munsafe-fp-atomics",
-        "CMAKE_HIP_FLAGS_DEBUG": "-g -ggdb -O"
+        "CMAKE_HIP_ARCHITECTURES":  {"type": "STRING", "value": "gfx90a"}
       }
     },
     {
@@ -89,9 +107,7 @@
       "description": "Build with optimizations and without debug assertions",
       "cacheVariables": {
         "CELERITAS_DEBUG":  {"type": "BOOL",   "value": "OFF"},
-        "CMAKE_BUILD_TYPE": {"type": "STRING", "value": "Release"},
-        "CMAKE_CUDA_FLAGS_RELEASE": "-O3 -DNDEBUG",
-        "CMAKE_HIP_FLAGS_RELEASE": "-O3 -DNDEBUG"
+        "CMAKE_BUILD_TYPE": {"type": "STRING", "value": "Release"}
       }
     },
     {