Update Spheral to use spack v1.1.0

.gitlab/jobs-mpi.yml

@@ -37,11 +37,11 @@ toss_gcc_mvapich2_test:
   needs: [toss_gcc_mvapich2_build]
 
 toss_gcc_mvapich2_perf:
-  extends: [.toss_shell1, .gcc_mvapich2, .run_perf, .perf_pr_rule]
+  extends: [.toss_shell1, .gcc_mvapich2, .run_perf]
   needs: [toss_gcc_mvapich2_build]
 
 toss_gcc_mvapich2_cleanup:
-  extends: [.toss_resource2, .gcc_mvapich2, .cleanup_dir, .cleanup_rule]
+  extends: [.toss_resource2, .gcc_mvapich2, .cleanup_dir]
 
 
 
@@ -61,11 +61,11 @@ toss_clang_mvapich2_test:
   needs: [toss_clang_mvapich2_build]
 
 toss_clang_mvapich2_perf:
-  extends: [.toss_shell2, .clang_mvapich2, .run_perf, .perf_pr_rule]
+  extends: [.toss_shell2, .clang_mvapich2, .run_perf]
   needs: [toss_clang_mvapich2_build]
 
 toss_clang_mvapich2_cleanup:
-  extends: [.toss_resource3, .clang_mvapich2, .cleanup_dir, .cleanup_rule]
+  extends: [.toss_resource3, .clang_mvapich2, .cleanup_dir]
 
 
 
@@ -89,11 +89,11 @@ cray_rocm_mpich_test:
   needs: [cray_rocm_mpich_build]
 
 cray_rocm_mpich_perf:
-  extends: [.cray_shell1, .rocm_mpich, .run_perf, .perf_pr_rule]
+  extends: [.cray_shell1, .rocm_mpich, .run_perf]
   needs: [cray_rocm_mpich_build]
 
 cray_rocm_mpich_cleanup:
-  extends: [.cray_resource1, .rocm_mpich, .cleanup_dir, .cleanup_rule]
+  extends: [.cray_resource1, .rocm_mpich, .cleanup_dir]
 
 
 
@@ -113,8 +113,8 @@ cray_hip_rocm_mpich_test:
   needs: [cray_hip_rocm_mpich_build]
 
 cray_hip_rocm_mpich_perf:
-  extends: [.cray_shell2, .hip_rocm_mpich, .run_perf, .perf_pr_rule]
+  extends: [.cray_shell2, .hip_rocm_mpich, .run_perf]
   needs: [cray_hip_rocm_mpich_build]
 
 cray_hip_rocm_mpich_cleanup:
-  extends: [.cray_resource2, .hip_rocm_mpich, .cleanup_dir, .cleanup_rule]
+  extends: [.cray_resource2, .hip_rocm_mpich, .cleanup_dir]

.gitlab/jobs-prod.yml

@@ -2,18 +2,12 @@
 # UPDATE TPL JOBS
 
 toss_update_tpls:
-  extends: [.toss_resource2, .update_tpls, .merge_pr_rule]
+  extends: [.toss_resource2, .update_tpls]
 
 cray_update_tpls:
-  extends: [.cray_resource2, .update_tpls, .merge_pr_rule]
+  extends: [.cray_resource2, .update_tpls]
   needs: [toss_update_tpls]
 
-# ------------------------------------------------------------------------------
-# UPDATE PERM JOBS
-
-shared_tpls_update_permissions:
-  extends: [.toss_resource_general, .toss_update_permissions, .merge_pr_rule]
-
 # ------------------------------------------------------------------------------
 # PROD BUILD JOBS
 

.gitlab/os.yml

@@ -4,7 +4,6 @@
 .sys_config:
   variables:
     LLNL_SERVICE_USER: sphapp
-    UPSTREAM_DIR: /usr/WS2/sduser/Spheral/spack_upstream/0.22
     DISPLAY: ':0.0'
 
 .on_toss_4_x86:

.gitlab/scripts.yml

@@ -5,7 +5,6 @@
 .init:
   variables:
     GIT_STRATEGY: clone
-    GIT_SUBMODULE_STRATEGY: recursive
   stage: init
   script:
     - echo $USER
@@ -86,7 +85,7 @@
 
 # Run the performance suite and move the resulting Caliper files into the benchmark location
 .run_perf:
-  extends: [.retry_rule]
+  extends: [.retry_rule, .perf_pr_rule]
   stage: run_perf
   variables:
     GIT_STRATEGY: none
@@ -105,6 +104,7 @@
 
 .cleanup_dir:
   stage: cleanup
+  extends: [.cleanup_rule]
   variables:
     GIT_STRATEGY: empty
   script:
@@ -121,16 +121,15 @@
 
 .update_tpls:
   stage: update_tpls
-  script:
-    - ./$SCRIPT_DIR/devtools/tpl-manager.py --no-upstream --spack-dir=$UPSTREAM_DIR
-
-.toss_update_permissions:
-  stage: update_permissions
   variables:
-    GIT_STRATEGY: none
+    GIT_STRATEGY: clone
+  extends: [.merge_pr_rule]
+  rules:
+    - if: '$CI_COMMIT_MESSAGE =~ /update-upstream/'
+      when: always
   script:
-    - ml load mpifileutils
-    - dchmod --mode go+rx $UPSTREAM_DIR
+    - ./$SCRIPT_DIR/devtools/tpl-manager.py --update-upstream
+  dependencies: []
 
 # ------------------------------------------------------------------------------
 # Production Installation scripts

.gitlab/specs.yml

@@ -3,28 +3,28 @@
 
 .gcc_mvapich2_cxxonly:
   variables:
-    SPEC: '%gcc+mpi'
+    SPEC: '+mpi%gcc'
     EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_PYTHON=OFF -DSPHERAL_ENABLE_STATIC=ON -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_mvapich2:
   variables:
-    SPEC: '%gcc+mpi'
+    SPEC: '+mpi%gcc'
     EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi:
   variables:
-    SPEC: '%gcc~mpi'
+    SPEC: '~mpi%gcc'
     EXTRA_CMAKE_ARGS: '-DSPHERAL_ENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi_Debug:
   variables:
-    SPEC: '%gcc~mpi'
+    SPEC: '~mpi%gcc'
     EXTRA_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DENABLE_WARNINGS_AS_ERRORS=On'
 
 
 .clang_mvapich2:
   variables:
-    SPEC: '%clang+mpi'
+    SPEC: '+mpi%clang'
     EXTRA_CMAKE_ARGS: '-DENABLE_WARNINGS_AS_ERRORS=On -DENABLE_DEV_BUILD=On'
 
 
@@ -42,21 +42,21 @@
 
 .rocm_mpich:
   variables:
-    SPEC: '%rocmcc+mpi~rocm'
+    SPEC: '+mpi~rocm%rocmcc'
 
 .rocm_~mpi:
   variables:
-    SPEC: '%rocmcc~mpi~rocm'
+    SPEC: '~mpi~rocm%rocmcc'
 
 .rocm_~mpi_Debug:
   variables:
-    SPEC: '%rocmcc~mpi~rocm'
+    SPEC: '~mpi~rocm%rocmcc'
     EXTRA_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .hip_rocm_mpich:
   variables:
-    SPEC: '%rocmcc+mpi+rocm'
+    SPEC: '+mpi+rocm%rocmcc'
 
 .hip_rocm_~mpi:
   variables:
-    SPEC: '%rocmcc~mpi+rocm'
+    SPEC: '~mpi+rocm%rocmcc'

Dockerfile

@@ -22,7 +22,7 @@
 # -----------------------------------------------------------------------------
 # SPHERAL-BUILD-ENV
 # -----------------------------------------------------------------------------
-FROM ubuntu:20.04 AS spheral-build-env-local
+FROM ubuntu:24.04 AS spheral-build-env-local
 
 ARG SPEC=gcc
 ARG HOST_CONFIG=docker-$SPEC
@@ -31,7 +31,7 @@ ARG HOST_CONFIG=docker-$SPEC
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y
 RUN apt-get upgrade -y
-RUN apt-get install -y build-essential git gfortran mpich autotools-dev autoconf sqlite pkg-config uuid gettext cmake libncurses-dev libgdbm-dev libffi-dev libssl-dev libexpat-dev libreadline-dev libbz2-dev locales python python3 unzip libtool wget curl libcurl4-openssl-dev tk-dev
+RUN apt-get install -y build-essential git gfortran autotools-dev autoconf sqlite3 pkg-config uuid gettext cmake openmpi-bin libopenmpi-dev libncurses-dev libgdbm-dev libffi-dev libssl-dev libexpat-dev libreadline-dev libbz2-dev locales python3 unzip libtool wget curl libcurl4-openssl-dev tk-dev
 RUN apt-get install -y python3-dev python3-venv python3-pip
 RUN apt-get install -y iputils-ping
 
@@ -40,11 +40,9 @@ RUN locale-gen en_US.UTF-8
 
 # Set up TPLs for SPEC
 WORKDIR /home/spheral/workspace/
-COPY scripts scripts
-
 
+COPY scripts scripts
 RUN python3 scripts/devtools/tpl-manager.py --spec spheral%$SPEC --spack-dir /home
-
 COPY . .
 
 # Configure Spheral with SPEC TPLs.