Merge pull request #449 from llnl/rc-v2025.12.0

Rc v2025.12.0

Author: ldowen

.github/workflows/docker-image.yml

@@ -11,6 +11,9 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
     - name: Checkout repository

.github/workflows/test-tpls.yml

@@ -7,7 +7,10 @@ on:
       - scripts/devtools/**
       - scripts/runtime-requirements.txt.in
       - scripts/build-requirements.txt
-
+      - Dockerfile
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: llnl/spheral

.gitignore

@@ -44,3 +44,5 @@ toss_*.cmake
 blueos_*.cmake
 
 /build-*
+src/*/*.2.cc
+src/*/*.3.cc

.gitlab/jobs-mpi.yml

@@ -14,7 +14,10 @@ toss_gcc_mvapich2_cxxonly_build:
 
 toss_gcc_mvapich2_cxxonly_cleanup:
   extends: [.toss_resource1, .gcc_mvapich2_cxxonly, .cleanup_dir]
-  needs: [toss_gcc_mvapich2_cxxonly_build]
+  needs:
+    - job: export_test
+      optional: true
+    - job: toss_gcc_mvapich2_cxxonly_build
 
 
 

.gitlab/machines.yml

@@ -22,21 +22,21 @@
   timeout: 24 hours
   extends: [.on_toss_4_x86_cray]
 
-.on_ruby:
+.on_dane:
   tags:
-    - ruby
+    - dane
     - batch
   variables:
     JACAMAR_SCHEDULER_ACTION: default
     SCHEDULER_PARAMETERS: "--reservation=ci --exclusive -N 1 -t 120"
-    NPROC: 56
-    HOSTNAME: 'ruby'
+    NPROC: 112
+    HOSTNAME: 'dane'
   timeout: 24 hours
   extends: [.on_toss_4_x86]
 
-.ruby_shell:
+.dane_shell:
   tags:
-    - ruby
+    - dane
     - shell
   variables:
     ENVIRONMENT: "INTERACTIVE"
@@ -46,17 +46,17 @@
 # ------------------------------------------------------------------------------
 
 .toss_resource_general:
-  extends: [.on_ruby]
+  extends: [.on_dane]
 
 .cray_resource_general:
   extends: [.on_tioga]
 
 .toss_shell1:
-  extends: [.ruby_shell]
+  extends: [.dane_shell]
 
 # Use for performance tests
 .toss_shell2:
-  extends: [.ruby_shell]
+  extends: [.dane_shell]
 
 .cray_shell1:
   extends: [.tioga_shell]

.gitlab/scripts.yml

@@ -3,6 +3,9 @@
 # ------------------------------------------------------------------------------
 
 .init:
+  variables:
+    GIT_STRATEGY: clone
+    GIT_SUBMODULE_STRATEGY: recursive
   stage: init
   script:
     - echo $USER
@@ -40,7 +43,7 @@
   script:
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
-    - ./$SCRIPT_DIR/devtools/host-config-build.py --no-clean --build --ctest --nprocs $NPROC --host-config gitlab.cmake -DENABLE_TIMER=ON $EXTRA_CMAKE_ARGS
+    - ./$SCRIPT_DIR/devtools/host-config-build.py --no-clean --build --ctest --nprocs $NPROC --host-config gitlab.cmake -DSPHERAL_ENABLE_TIMERS=ON $EXTRA_CMAKE_ARGS
   artifacts:
     paths:
       - ci-dir.txt
@@ -52,7 +55,7 @@
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
 
-    - ./build_gitlab/install/spheral -c "import $SPHERAL_MODULE"
+    - ./build_gitlab/install/bin/spheral -c "import $SPHERAL_MODULE"
   artifacts:
     paths:
       - ci-dir.txt
@@ -69,7 +72,7 @@
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
 
-    - ./build_gitlab/install/spheral-ats --ciRun ./build_gitlab/install/$ATS_FILE || exit_code=$?
+    - ./build_gitlab/install/bin/spheral-ats --ciRun ./build_gitlab/install/$ATS_FILE || exit_code=$?
     - cp -r test-logs $CI_PROJECT_DIR
     - exit $exit_code
   artifacts:
@@ -93,7 +96,7 @@
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
 
-    - ./build_gitlab/install/spheral-ats --ciRun --numNodes 2 --delay --batch --logs perf_logs ./build_gitlab/install/$PERF_ATS_FILE || exit_code=$?
+    - ./build_gitlab/install/bin/spheral-ats --ciRun --numNodes 2 --delay --batch --logs perf_logs ./build_gitlab/install/$PERF_ATS_FILE || exit_code=$?
     - exit $exit_code
   artifacts:
     when: always
@@ -117,6 +120,9 @@
 # ------------------------------------------------------------------------------
 
 .update_tpls:
+  variables:
+    GIT_STRATEGY: clone
+    GIT_SUBMODULE_STRATEGY: recursive
   stage: update_tpls
   script:
     - ./$SCRIPT_DIR/devtools/tpl-manager.py --no-upstream --spack-dir=$UPSTREAM_DIR
@@ -145,6 +151,9 @@
 #       bootstrap_cache/
 
 .build_dev_pkg:
+  variables:
+    GIT_STRATEGY: clone
+    GIT_SUBMODULE_STRATEGY: recursive
   stage: generate_buildcache
   extends: [.spheral_rev_str]
   script:

.gitlab/specs.yml

@@ -4,17 +4,17 @@
 .gcc_mvapich2_cxxonly:
   variables:
     SPEC: '%gcc+mpi'
-    EXTRA_CMAKE_ARGS: '-DENABLE_CXXONLY=On -DENABLE_WARNINGS_AS_ERRORS=On'
+    EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_PYTHON=OFF -DSPHERAL_ENABLE_STATIC=ON -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_mvapich2:
   variables:
     SPEC: '%gcc+mpi'
-    EXTRA_CMAKE_ARGS: '-DENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
+    EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi:
   variables:
     SPEC: '%gcc~mpi'
-    EXTRA_CMAKE_ARGS: '-DENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
+    EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi_Debug:
   variables:

.gitmodules

@@ -8,11 +8,6 @@
 [submodule "extern/PolyClipper"]
 	path = extern/PolyClipper
 	url = https://github.com/LLNL/PolyClipper
-[submodule "extern/chai"]
-	path = extern/chai
-	url = https://github.com/llnl/chai
-	branch = feature/ManagedSharedPtr
-	ignore = all
 [submodule "extern/ATS"]
 	path = extern/ATS
 	url = https://github.com/LLNL/ATS

.readthedocs.yaml

@@ -1,5 +1,21 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
 version: 2
 
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Explicitly set the version of Python and its requirements
 python:
   install:
-  - requirements: docs/requirements.txt
+    - requirements: docs/requirements.txt