Merge branch 'develop' into feature/kweiss/update-gh-actions

Author: rhornung67

.gitignore

@@ -15,6 +15,7 @@ _axom_build_and_test_*
 tpl_dirs_summary.json
 *.swp
 *.vscode*
+.vs/*
 uberenv_libs
 *_build*
 .idea

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -29,13 +29,14 @@ stages:
 .src_build_script:
   script:
     # Use pre-existing allocation if any
-    - JOBID=$(if [[ "$SYS_TYPE" == "toss_3_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
+    - export JOBID=$(if [[ "$SYS_TYPE" == "toss_4_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
     - ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
     # BUILD + TEST
     - echo -e "\e[0Ksection_start:$(date +%s):src_build_and_test\r\e[0KSource Build and Test ${CI_PROJECT_NAME}"
     - ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug} ${EXTRA_OPTIONS}
     - echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
   artifacts:
+    expire_in: 2 weeks
     paths:
       - _axom_build_and_test_*/output.log*.txt
       - _axom_build_and_test_*/build-*/output.log*.txt
@@ -48,14 +49,15 @@ stages:
     - ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_tpls.py -v --spec="${SPEC} ${EXTRA_SPEC}" --directory=${FULL_BUILD_ROOT}
     - echo -e "\e[0Ksection_end:$(date +%s):full_build_and_test\r\e[0K"
   artifacts:
+    expire_in: 2 weeks
     paths:
       - ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/output.log*.txt
-      - ${FULL_BUILD_ROOT}}/${SYS_TYPE}/*/_axom_build_and_test_*/build-*/output.log*.txt
+      - ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/build-*/output.log*.txt
     reports:
       junit: ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/build-*/junit.xml
 
 # This is where jobs are included
 include:
-  - local: .gitlab/build_ruby.yml
+  - local: .gitlab/build_quartz.yml
   - local: .gitlab/build_lassen.yml
   - local: .gitlab/build_tioga.yml

.gitlab/build_lassen.yml

@@ -1,39 +1,35 @@
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
 # other Axom Project Developers. See the top-level LICENSE file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
 
 ####
 # This is the share configuration of jobs for lassen
 .on_lassen:
-  variables:
   tags:
     - shell
     - lassen
   rules:
     - if: '$CI_COMMIT_BRANCH =~ /_lnone/ || $ON_LASSEN == "OFF"' #run except if ...
       when: never
     - when: on_success
-
-####
-# Load required CUDA module
-.with_cuda:
   before_script:
     - module load cuda/11.2.0
+    - module load cmake/3.21.1
 
 ####
 # Template
 .src_build_on_lassen:
   stage: build
   variables:
-    ALLOC_COMMAND: "lalloc 1 -W 25 -q pdebug"
+    ALLOC_COMMAND: "lalloc 1 -W 25 -q pwdev -G wdev -alloc_flags atsdisable"
   extends: [.src_build_script, .on_lassen, .src_workflow]
   needs: []
 
 .full_build_on_lassen:
   stage: build
   variables:
-    ALLOC_COMMAND: "lalloc 1 -W 45 -q pdebug"
+    ALLOC_COMMAND: "lalloc 1 -W 45 -q pwdev -G wdev -alloc_flags atsdisable"
   extends: [.full_build_script, .on_lassen, .full_workflow]
   needs: []
 
@@ -49,7 +45,7 @@ lassen-clang_10_0_1_cuda-src:
   variables:
     COMPILER: "[email protected]_cuda"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
-  extends: [.src_build_on_lassen, .with_cuda]
+  extends: [.src_build_on_lassen]
 
 lassen-gcc_8_3_1-src:
   variables:
@@ -61,7 +57,7 @@ lassen-gcc_8_3_1_cuda-src:
   variables:
     COMPILER: "[email protected]_cuda"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
-  extends: [.src_build_on_lassen, .with_cuda]
+  extends: [.src_build_on_lassen]
 
 lassen-xl_16_1_1-src:
   variables:
@@ -73,7 +69,7 @@ lassen-xl_16_1_1_cuda-src:
   variables:
     COMPILER: "[email protected]_cuda"
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
-  extends: [.src_build_on_lassen, .with_cuda]
+  extends: [.src_build_on_lassen]
 
 ####
 # Full Build jobs
@@ -88,7 +84,7 @@ lassen-clang_10_0_1_cuda-full:
     COMPILER: "[email protected]"
     SPEC: "%${COMPILER}+mfem+cuda~openmp"
     EXTRA_SPEC: "cuda_arch=70"
-  extends: [.full_build_on_lassen, .with_cuda]
+  extends: [.full_build_on_lassen]
 
 lassen-gcc_8_3_1-full:
   variables:
@@ -101,7 +97,7 @@ lassen-gcc_8_3_1_cuda-full:
     COMPILER: "[email protected]"
     SPEC: "%${COMPILER}~mfem+cuda"
     EXTRA_SPEC: "cuda_arch=70"
-  extends: [.full_build_on_lassen, .with_cuda]
+  extends: [.full_build_on_lassen]
 
 lassen-xl_16_1_1-full:
   variables:
@@ -114,4 +110,4 @@ lassen-xl_16_1_1_cuda-full:
     COMPILER: "[email protected]"
     SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
     EXTRA_SPEC: "cuda_arch=70"
-  extends: [.full_build_on_lassen, .with_cuda]
+  extends: [.full_build_on_lassen]

.gitlab/build_quartz.yml

@@ -0,0 +1,128 @@
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
+# other Axom Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+
+####
+# This is the shared configuration of jobs for quartz
+.on_quartz:
+  tags:
+    - shell
+    - quartz
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_RUBY == "OFF"' #run except if ...
+      when: never
+    - if: '$CI_JOB_NAME =~ /quartz_release/'
+      when: always
+    - when: on_success
+  before_script:
+    - module load cmake/3.19.2
+
+####
+# In pre-build phase, allocate a node for builds
+quartz_allocate:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on_quartz, .src_workflow]
+  stage: allocate
+  script:
+    # Use when ellastic ci is on quartz or we go back to ruby
+    #- salloc --reservation=ci --qos=ci_ruby -N 1 -c 36 -t 60 --no-shell --job-name=${PROJECT_ALLOC_NAME}
+    - salloc -N 1 -c 36 -t 60 -p pdebug --no-shell --job-name=${PROJECT_ALLOC_NAME}
+  needs: []
+
+####
+# In post-build phase, deallocate resources
+# Note : make sure this is run even on build phase failure
+quartz_release:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on_quartz, .src_workflow]
+  stage: release
+  script:
+    - export JOBID=$(squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A)
+    - if [[ -n "${JOBID}" ]]; then scancel ${JOBID}; fi
+
+####
+# Template
+.src_build_on_quartz:
+  stage: build
+  variables:
+    # Use when ellastic ci is on quartz or we go back to ruby
+    # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
+    ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
+  extends: [.src_build_script, .on_quartz, .src_workflow]
+  needs: [quartz_allocate]
+
+.full_build_on_quartz:
+  stage: build
+  variables:
+    # Use when ellastic ci is on quartz or we go back to ruby
+    # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
+    ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
+  extends: [.full_build_script, .on_quartz, .full_workflow]
+  needs: []
+
+####
+# PR Build jobs
+quartz-clang_14_0_6-debug-src:
+  variables:
+    COMPILER: "[email protected]"
+    HOST_CONFIG: "quartz-toss_4_x86_64_ib-${COMPILER}.cmake"
+  extends: .src_build_on_quartz
+
+quartz-clang_14_0_6-release-src:
+  variables:
+    COMPILER: "[email protected]"
+    HOST_CONFIG: "quartz-toss_4_x86_64_ib-${COMPILER}.cmake"
+    BUILD_TYPE: "Release"
+    EXTRA_CMAKE_OPTIONS: "-DAXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS:BOOL=ON"
+  extends: .src_build_on_quartz
+
+quartz-gcc_10_3_1-src:
+  variables:
+    COMPILER: "[email protected]"
+    HOST_CONFIG: "quartz-toss_4_x86_64_ib-${COMPILER}.cmake"
+  extends: .src_build_on_quartz
+
+# TODO: turn back on
+#quartz-gcc_10_3_1_no_fortran-src:
+#  variables:
+#    COMPILER: "[email protected]"
+#    HOST_CONFIG: "quartz-toss_4_x86_64_ib-${COMPILER}_nofortran.cmake"
+#  extends: .src_build_on_quartz
+
+# disabled due to not actually having a host-config yet
+# quartz-intel_19_0_4-src:
+#   variables:
+#     COMPILER: "[email protected]"
+#     HOST_CONFIG: "quartz-toss_4_x86_64_ib-${COMPILER}.cmake"
+#   extends: .src_build_on_quartz
+
+
+####
+# Full Build jobs
+quartz-clang_14_0_6-full:
+  variables:
+    COMPILER: "[email protected]"
+    SPEC: "%${COMPILER}+mfem"
+  extends: .full_build_on_quartz
+
+quartz-gcc_10_3_1-full:
+  variables:
+    COMPILER: "[email protected]"
+    SPEC: "%${COMPILER}+mfem"
+  extends: .full_build_on_quartz
+
+quartz-gcc_10_3_1_no_fortran-full:
+  variables:
+    COMPILER: "[email protected]"
+    SPEC: "%${COMPILER}~fortran+mfem"
+  extends: .full_build_on_quartz
+
+# disabled due to not actually having a host-config yet
+#quartz-intel_19_0_4-full:
+#  variables:
+#    COMPILER: "[email protected]"
+#    SPEC: "%${COMPILER}+mfem~cpp14"
+#  extends: .full_build_on_quartz