Woptim/update deps

.gitlab-ci.yml

@@ -23,6 +23,9 @@
 
 # We define the following GitLab pipeline variables:
 variables:
+# Required information about GitHub repository
+  GITHUB_PROJECT_NAME: "CHAI"
+  GITHUB_PROJECT_ORG: "LLNL"
 # Use the umdev LLNL service user to run CI. This prevents from running
 # pipelines as an actual user.
   LLNL_SERVICE_USER: umdev
@@ -34,12 +37,18 @@ variables:
 # We build the projects in the CI clone directory.
 # TODO: add a clean-up mechanism
   BUILD_ROOT: ${CI_PROJECT_DIR}
+# Set the build-and-test command.
+  BUILD_AND_TEST_CMD: "./scripts/gitlab/build_and_test.sh"
+# Override the list of branch that will skip the "draft PR test".
+# Add protected branches here. Defaults to "develop main master".
+#  ALWAYS_RUN_LIST: ""
 
 # We organize the build-and-test stage in sub-pipelines. Each sub-pipeline
 # corresponds to a test batch on a given machine.
 
 # High level stages
 stages:
+  - machine-checks
   - build-and-test
 
 # Template for jobs triggering a build-and-test sub-pipelines:
@@ -49,13 +58,17 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: v2022.09.0
+        ref: v2023.03.1
         file: '${CI_MACHINE}-build-and-test.yml'
       - local: '.gitlab/${CI_MACHINE}-build-and-test-extra.yml'
     strategy: depend
     forward:
       pipeline_variables: true
 
-# pipelines subscribed by the project
 include:
+  # [Optional] checks preliminary to running the actual CI test
+  #- project: 'radiuss/radiuss-shared-ci'
+  #  ref: v2023.03.1
+  #  file: 'preliminary-ignore-draft-pr.yml'
+  # pipelines subscribed by the project
   - local: .gitlab/subscribed-pipelines.yml

.gitlab/custom-jobs-and-variables.yml

@@ -15,30 +15,40 @@ variables:
 
 # Ruby
 # Arguments for top level allocation
-  RUBY_BUILD_AND_TEST_SHARED_ALLOC: "--exclusive --partition=pdebug --time=20 --nodes=1"
+  RUBY_BUILD_AND_TEST_SHARED_ALLOC: "--exclusive --reservation=ci --qos=ci_ruby --time=20 --nodes=1"
 # Arguments for job level allocation
-  RUBY_BUILD_AND_TEST_JOB_ALLOC: "--overlap --time=20 --nodes=1"
+  RUBY_BUILD_AND_TEST_JOB_ALLOC: "--overlap --reservation=ci --time=20 --nodes=1"
 # Project specific variants for ruby
-  PROJECT_RUBY_VARIANTS: ""
+  PROJECT_RUBY_VARIANTS: "~shared +raja tests=basic "
 # Project specific deps for ruby
   PROJECT_RUBY_DEPS: ""
 
 # Corona
 # Arguments for top level allocation
-  CORONA_BUILD_AND_TEST_SHARED_ALLOC: "--time-limit=30m --nodes=1"
+  CORONA_BUILD_AND_TEST_SHARED_ALLOC: "--exclusive --time-limit=45m --nodes=1"
 # Arguments for job level allocation
-  CORONA_BUILD_AND_TEST_JOB_ALLOC: "--time-limit=30m --nodes=1"
+  CORONA_BUILD_AND_TEST_JOB_ALLOC: "--time-limit=30m --nodes=1 --begin-time=+5s"
 # Project specific variants for corona
-  PROJECT_CORONA_VARIANTS: ""
+  PROJECT_CORONA_VARIANTS: "~shared +raja tests=basic "
 # Project specific deps for corona
   PROJECT_CORONA_DEPS: ""
 
+# Tioga
+# Arguments for top level allocation
+  TIOGA_BUILD_AND_TEST_SHARED_ALLOC: "--exclusive --time-limit=45m --nodes=1"
+# Arguments for job level allocation
+  TIOGA_BUILD_AND_TEST_JOB_ALLOC: "--time-limit=30m --nodes=1 --begin-time=+5s"
+# Project specific variants for tioga
+  PROJECT_TIOGA_VARIANTS: "~shared +raja tests=basic "
+# Project specific deps for tioga
+  PROJECT_TIOGA_DEPS: ""
+
 # Lassen and Butte use a different job scheduler (spectrum lsf) that does not
 # allow pre-allocation the same way slurm does.
 # Arguments for job level allocation
   LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 120"
 # Project specific variants for lassen
-  PROJECT_LASSEN_VARIANTS: ""
+  PROJECT_LASSEN_VARIANTS: "~shared +raja cuda_arch=70 tests=basic"
 # Project specific deps for lassen
   PROJECT_LASSEN_DEPS: ""
 

.gitlab/lassen-build-and-test-extra.yml

@@ -12,18 +12,11 @@
 # We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS} So that
 # the comparison with the original job is easier.
 
-# Overriding shared spec: Longer allocation + Allow failures : known to fail at raja install
-pgi_20_4_gcc_8_3_1:
-  extends: .build_and_test_on_lassen
+# Override job with old cuda to allow it to fail.
+clang_12_0_1_gcc_8_3_1_cuda_10_1_243:
   variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %pgi@20.4 cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  allow_failure: true
-
-# Overriding shared spec: Allow failures : known to fail at raja install
-ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168:
+    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@12.0.1.gcc.8.3.1 ^cuda@10.1.243+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
   extends: .build_and_test_on_lassen
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %clang@ibm.9.0.0 cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
   allow_failure: true
 
 
@@ -34,26 +27,20 @@ ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-# In RAJA, this spec has an updated cuda (11.0.2), with cuda_arch=70 set.
-ibm_clang_9_0_0_cuda_10_1_168:
-  variables:
-    SPEC: "+cuda %clang@ibm.9.0.0 ^cuda@10.1.168"
+clang_12_0_1_libcpp:
   extends: .build_and_test_on_lassen
-
-clang_9_0_0_libcpp (build and test on lassen):
   variables:
-    SPEC: "%clang@9.0.0 cxxflags=\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" cflags=\"-DGTEST_HAS_CXXABI_H_=0\""
-  extends: .build_and_test_on_lassen
+    SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\""
 
-clang_9_0_0_memleak (build and test on lassen):
+clang_12_0_1_gcc_8_3_1_memleak:
+  extends: .build_and_test_on_lassen
   variables:
-    SPEC: "%clang@9.0.0 cxxflags=-fsanitize=address"
+    SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\""
     ASAN_OPTIONS: "detect_leaks=1"
-  extends: .build_and_test_on_lassen
 
-clang_9_0_0_datarace (build and test on lassen):
+clang_12_0_1_datarace:
+  extends: .build_and_test_on_lassen
   variables:
-    SPEC: "%clang@9.0.0 cxxflags=-fsanitize=thread"
+    SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\""
   allow_failure: true
-  extends: .build_and_test_on_lassen
 

.gitlab/ruby-build-and-test-extra.yml

@@ -12,13 +12,7 @@
 # We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS} So that
 # the comparison with the original job is easier.
 
-# Overriding shared spec: Allow failures
-pgi_20_1_gcc_local_8_3_1:
-  variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %pgi@20.1 cxxflags\"=-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" cflags\"=-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" fflags=\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" ${PROJECT_RUBY_DEPS}"
-  extends: .build_and_test_on_ruby
-  allow_failure: true
-
+# No overridden jobs so far.
 
 ############
 # Extra jobs
@@ -27,13 +21,8 @@ pgi_20_1_gcc_local_8_3_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-gcc_4_9_3:
+clang_14_0_6_develop_tpls:
   variables:
-    SPEC: "%gcc@4.9.3"
+    SPEC: " %clang@14.0.6 ^umpire@develop ^raja@develop ^camp@main"
   extends: .build_and_test_on_ruby
 
-#clang_10_develop_tpls:
-#  variables:
-#    SPEC: " %clang@10.0.1 ^umpire@develop ^raja@develop ^camp@main"
-#  extends: .build_and_test_on_ruby
-

.gitlab/subscribed-pipelines.yml

@@ -5,18 +5,74 @@
 # SPDX-License-Identifier: (MIT)
 ###############################################################################
 
-# Trigger a build-and-test pipeline for ruby, corona and lassen
+# The template job to test whether a machine is up.
+# Expects CI_MACHINE defined to machine name.
+.machine-check:
+  stage: machine-checks
+  tags: [shell, oslic]
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - |
+      if [[ $(jq '.[env.CI_MACHINE].total_nodes_up' /usr/global/tools/lorenz/data/loginnodeStatus) == 0 ]]
+      then
+        echo -e "\e[31mNo node available on ${CI_MACHINE}\e[0m"
+        curl --url "https://api.github.com/repos/${GITHUB_PROJECT_ORG}/${GITHUB_PROJECT_NAME}/statuses/${CI_COMMIT_SHA}" \
+             --header 'Content-Type: application/json' \
+             --header "authorization: Bearer ${GITHUB_TOKEN}" \
+             --data "{ \"state\": \"failure\", \"target_url\": \"${CI_PIPELINE_URL}\", \"description\": \"GitLab ${CI_MACHINE} down\", \"context\": \"ci/gitlab/${CI_MACHINE}\" }"
+        exit 1
+      fi
+
+###
+# Trigger a build-and-test pipeline for a machine.
+# Comment the jobs for machines you don’t need.
+###
+
+# RUBY
+ruby-up-check:
+  variables:
+    CI_MACHINE: "ruby"
+  extends: [.machine-check]
+
 ruby-build-and-test:
   variables:
     CI_MACHINE: "ruby"
+  needs: [ruby-up-check]
   extends: [.build-and-test]
 
+# CORONA
+corona-up-check:
+  variables:
+    CI_MACHINE: "corona"
+  extends: [.machine-check]
+
 corona-build-and-test:
   variables:
     CI_MACHINE: "corona"
+  needs: [corona-up-check]
   extends: [.build-and-test]
 
+# TIOGA
+tioga-up-check:
+  variables:
+    CI_MACHINE: "tioga"
+  extends: [.machine-check]
+
+tioga-build-and-test:
+  variables:
+    CI_MACHINE: "tioga"
+  needs: [tioga-up-check]
+  extends: [.build-and-test]
+
+# LASSEN
+lassen-up-check:
+  variables:
+    CI_MACHINE: "lassen"
+  extends: [.machine-check]
+
 lassen-build-and-test:
   variables:
     CI_MACHINE: "lassen"
+  needs: [lassen-up-check]
   extends: [.build-and-test]

.gitlab/tioga-build-and-test-extra.yml

@@ -0,0 +1,9 @@
+##############################################################################
+# Copyright (c) 2022, Lawrence Livermore National Security, LLC and RADIUSS
+# project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+variables:
+  INCLUDED_FILE_CANNOT_BE_EMPTY: "True"

.uberenv_config.json

@@ -1,13 +1,14 @@
 {
 "package_name" : "chai",
 "package_version" : "develop",
-"package_final_phase" : "hostconfig",
+"package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "v0.18.1",
+"spack_branch": "e4s-23.02",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
-"spack_packages_path": "scripts/spack_packages",
+"spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",
-"spack_setup_clingo": false
+"spack_setup_clingo": false,
+"debug": true
 }