Update packages and configs in RADIUSS Spack Configs

.gitlab-ci.yml

@@ -76,7 +76,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2025.06.0'
+        ref: 'v2025.09.0'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -90,7 +90,7 @@ include:
     file: 'id_tokens.yml'
   # [Optional] checks preliminary to running the actual CI test
   - project: 'radiuss/radiuss-shared-ci'
-    ref: 'v2025.06.0'
+    ref: 'v2025.09.0'
     file: 'utilities/preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'

.gitlab/jobs/corona.yml

@@ -14,11 +14,11 @@
 variables:
   INCLUDED_FILE_CANNOT_BE_EMPTY: "True"
 
-# The correct way is now to use rocmcc compiler directly as done in shared spec
+# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec
 ### Template for extra jobs defined by the project.
 #clang14.0.6-rocm5.4.1:
 #  variables:
-#    SPEC: "%clang@14.0.6 +rocm amdgpu_target=gfx906 ^[email protected] "
+#    SPEC: "%llvm@14.0.6 +rocm amdgpu_target=gfx906 ^[email protected] "
 #  extends: .job_on_corona
 
 master:

.gitlab/jobs/lassen.yml

@@ -23,14 +23,6 @@ variables:
 
 # No overridden jobs so far.
 
-# Allow failure due to weird error only with XL on Lassen. Passes in debug mode.
-xl_2023_06_28_gcc_11_2_1_cuda_11_8_0:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1 ^[email protected]+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
-    MODULE_LIST: "cuda/11.8.0"
-  extends: .job_on_lassen
-  allow_failure: true
-
 ############
 # Extra jobs
 ############

.gitlab/jobs/tioga.yml

@@ -36,7 +36,7 @@ cce_18_0_1:
 # We do not recommend using ${PROJECT_<MACHINE>_VARIANTS} and
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
-# The correct way is now to use rocmcc compiler directly as done in shared spec
+# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec
 
 # As long as cce 18 fails, we keep this one.
 cce_17_0_1:

.gitlab/jobs/tuolumne.yml

@@ -36,7 +36,7 @@ cce_18_0_1:
 # We do not recommend using ${PROJECT_<MACHINE>_VARIANTS} and
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
-# The correct way is now to use rocmcc compiler directly as done in shared spec
+# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec
 
 # As long as cce 18 fails, we keep this one.
 cce_19_0_0:

.gitlab/subscribed-pipelines.yml

@@ -50,64 +50,105 @@ generate-job-lists:
       - tioga-jobs.yml
       - tuolumne-jobs.yml
 
-
 # DANE
 dane-up-check:
   variables:
     CI_MACHINE: "dane"
   extends: [.machine-check]
+  rules:
+    # Runs except if we explicitly deactivate dane by variable.
+    - if: '$ON_DANE == "OFF"'
+      when: never
+    - when: on_success
 
 dane-build-and-test:
   variables:
     CI_MACHINE: "dane"
   needs: [dane-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    # Runs except if we explicitly deactivate dane by variable.
+    - if: '$ON_DANE == "OFF"'
+      when: never
+    - when: on_success
 
 # CORONA
 corona-up-check:
   variables:
     CI_MACHINE: "corona"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_CORONA == "OFF"'
+      when: never
+    - when: on_success
 
 corona-build-and-test:
   variables:
     CI_MACHINE: "corona"
   needs: [corona-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_CORONA == "OFF"'
+      when: never
+    - when: on_success
 
 # TIOGA
 tioga-up-check:
   variables:
     CI_MACHINE: "tioga"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_TIOGA == "OFF"'
+      when: never
+    - when: on_success
 
 tioga-build-and-test:
   variables:
     CI_MACHINE: "tioga"
   needs: [tioga-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_TIOGA == "OFF"'
+      when: never
+    - when: on_success
 
 # TUOLUMNE
 tuolumne-up-check:
   variables:
     CI_MACHINE: "tuolumne"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_TUOLUMNE == "OFF"'
+      when: never
+    - when: on_success
 
 tuolumne-build-and-test:
   variables:
     CI_MACHINE: "tuolumne"
   needs: [tuolumne-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_TUOLUMNE == "OFF"'
+      when: never
+    - when: on_success
 
 # LASSEN
 lassen-up-check:
   variables:
     CI_MACHINE: "lassen"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_LASSEN == "OFF"'
+      when: never
+    - when: on_success
 
 lassen-build-and-test:
   variables:
     CI_MACHINE: "lassen"
   needs: [lassen-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_LASSEN == "OFF"'
+      when: never
+    - when: on_success
 

.uberenv_config.json

@@ -1,12 +1,11 @@
 {
-    "package_name" : "caliper",
-    "package_version" : "master",
-    "package_source_dir" : "../..",
-    "package_final_phase" : "initconfig",
-    "spack_url": "https://github.com/spack/spack.git",
-    "spack_commit": "280017a9ba3f6a969743deca0eebc96e7c0e5cfd",
-    "spack_configs_path": "scripts/radiuss-spack-configs",
-    "spack_packages_path": "scripts/radiuss-spack-configs/packages",
-    "spack_concretizer": "clingo",
-    "spack_setup_clingo": false
-    }
+"package_name" : "caliper",
+"package_version" : "master",
+"package_final_phase" : "initconfig",
+"package_source_dir" : "../..",
+"spack_url": "https://github.com/spack/spack.git",
+"spack_branch": "v1.0.2",
+"spack_configs_path": "scripts/radiuss-spack-configs",
+"spack_packages_path": "scripts/radiuss-spack-configs/spack_repo/llnl_radiuss/packages",
+"spack_setup_clingo": false
+}

cmake/FindLibunwind.cmake

@@ -3,20 +3,38 @@
 #
 # LIBUNWIND_PREFIX      - Set to the libunwind installation directory
 #
-# LIBUNWIND_INCLUDE_DIR - Path to libunwind.h
+# LIBUNWIND_INCLUDE_DIRS - Path to libunwind.h
 # LIBUNWIND_LIBRARIES   - List of libraries for using libunwind
 # LIBUNWIND_FOUND       - True if libunwind was found
 
-find_path(LIBUNWIND_PREFIX
-  include/libunwind.h)
+if(LIBUNWIND_PREFIX)
+  # When prefix is explicitly provided, only look there
+  find_library(LIBUNWIND_LIBRARIES
+    NAMES unwind
+    PATHS ${LIBUNWIND_PREFIX}/lib
+    NO_DEFAULT_PATH)
 
-find_library(LIBUNWIND_LIBRARIES
-  NAMES unwind
-  HINTS ${LIBUNWIND_PREFIX}/lib)
+  find_path(LIBUNWIND_INCLUDE_DIRS
+    NAMES libunwind.h
+    PATHS ${LIBUNWIND_PREFIX}/include
+    NO_DEFAULT_PATH)
 
-find_path(LIBUNWIND_INCLUDE_DIRS
-  NAMES libunwind.h
-  HINTS ${LIBUNWIND_PREFIX}/include)
+  if(NOT LIBUNWIND_LIBRARIES OR NOT LIBUNWIND_INCLUDE_DIRS)
+    message(WARNING "LIBUNWIND_PREFIX was set to '${LIBUNWIND_PREFIX}' but libunwind was not found there")
+  endif()
+else()
+  # Try to find libunwind in standard locations
+  find_path(LIBUNWIND_PREFIX
+    include/libunwind.h)
+
+  find_library(LIBUNWIND_LIBRARIES
+    NAMES unwind
+    HINTS ${LIBUNWIND_PREFIX}/lib)
+
+  find_path(LIBUNWIND_INCLUDE_DIRS
+    NAMES libunwind.h
+    HINTS ${LIBUNWIND_PREFIX}/include)
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Libunwind DEFAULT_MSG LIBUNWIND_LIBRARIES LIBUNWIND_INCLUDE_DIRS)