v2025.01.0 Release

.gitignore

@@ -89,9 +89,8 @@ src/PBGWraps/SpheralModules_Silo.C
 src/PBGWraps/SpheralModules_Utilities.C
 src/PBGWraps/SpheralModules_WildMagic.C
 
-build-*
+/build-*
 src/*/*cc.2.cc
 src/*/*cc.3.cc
-/build/*/x64
-/build/*/*.user
-*.aps
+src/*/*/*cc.2.cc
+src/*/*/*cc.3.cc

.gitlab-ci.yml

@@ -6,6 +6,7 @@ variables:
 
   SCRIPT_DIR: "scripts"
   ATS_FILE: "tests/integration.ats"
+  PERF_ATS_FILE: "tests/performance.py"
   SPHERAL_MODULE: "Spheral"
   SPACK_NAME: spheral
   SPACK_PKG_NAME: spheral
@@ -16,15 +17,20 @@ variables:
     - SPHERAL_REV_STR="$SPHERAL_REV"
 
 stages:
+  - init
+  - tpls
   - build_and_install
   - run_ats
   - update_tpls
+  - run_perf
   - generate_buildcache
   - install_production
   - update_permissions
   - cleanup
 
 include:
+  - project: lc-templates/id_tokens
+    file: id_tokens.yml
   - local: .gitlab/os.yml
   - local: .gitlab/machines.yml
   - local: .gitlab/scripts.yml

.gitlab/jobs-mpi.yml

@@ -1,50 +1,117 @@
 # ------------------------------------------------------------------------------
 # BUILD JOBS
 
+toss_gcc_mvapich2_cxxonly_init:
+  extends: [.toss_shell1, .gcc_mvapich2_cxxonly, .init]
+
+toss_gcc_mvapich2_cxxonly_tpls:
+  extends: [.toss_resource1, .gcc_mvapich2_cxxonly, .tpls]
+  needs: [toss_gcc_mvapich2_cxxonly_init]
+
 toss_gcc_mvapich2_cxxonly_build:
   extends: [.toss_resource1, .gcc_mvapich2_cxxonly, .build]
+  needs: [toss_gcc_mvapich2_cxxonly_tpls]
+
+toss_gcc_mvapich2_cxxonly_cleanup:
+  extends: [.toss_resource1, .gcc_mvapich2_cxxonly, .cleanup_dir]
+  needs: [toss_gcc_mvapich2_cxxonly_build]
+
+
 
+toss_gcc_mvapich2_init:
+  extends: [.toss_shell1, .gcc_mvapich2, .init]
 
+toss_gcc_mvapich2_tpls:
+  extends: [.toss_resource2, .gcc_mvapich2, .tpls]
+  needs: [toss_gcc_mvapich2_init]
 
 toss_gcc_mvapich2_build:
   extends: [.toss_resource2, .gcc_mvapich2, .build_and_test]
+  needs: [toss_gcc_mvapich2_tpls]
 
 toss_gcc_mvapich2_test:
   extends: [.toss_resource2, .gcc_mvapich2, .run_ats]
   needs: [toss_gcc_mvapich2_build]
 
+toss_gcc_mvapich2_perf:
+  extends: [.toss_shell2, .gcc_mvapich2, .run_perf, .merge_pr_rule]
+  needs: [toss_gcc_mvapich2_build]
+
+toss_gcc_mvapich2_cleanup:
+  extends: [.toss_resource2, .gcc_mvapich2, .cleanup_dir]
+
+
 
+toss_clang_mvapich2_init:
+  extends: [.toss_shell1, .clang_mvapich2, .init]
+
+toss_clang_mvapich2_tpls:
+  extends: [.toss_resource3, .clang_mvapich2, .tpls]
+  needs: [toss_clang_mvapich2_init]
 
 toss_clang_mvapich2_build:
-  extends: [.toss_resource1, .clang_mvapich2, .build_and_test]
+  extends: [.toss_resource3, .clang_mvapich2, .build_and_test]
+  needs: [toss_clang_mvapich2_tpls]
 
 toss_clang_mvapich2_test:
-  extends: [.toss_resource2, .clang_mvapich2, .run_ats]
+  extends: [.toss_resource3, .clang_mvapich2, .run_ats]
+  needs: [toss_clang_mvapich2_build]
+
+toss_clang_mvapich2_perf:
+  extends: [.toss_shell2, .clang_mvapich2, .run_perf, .merge_pr_rule]
   needs: [toss_clang_mvapich2_build]
 
+toss_clang_mvapich2_cleanup:
+  extends: [.toss_resource3, .clang_mvapich2, .cleanup_dir]
+
 
 
 #toss_oneapi_2022_1_mvapich2:
 #  extends: [.oneapi_2022_1_mvapich2, .build_and_test, .toss_resource]
 
 
+cray_rocm_mpich_init:
+  extends: [.cray_shell1, .rocm_mpich, .init]
+
+cray_rocm_mpich_tpls:
+  extends: [.cray_resource1, .rocm_mpich, .tpls]
+  needs: [cray_rocm_mpich_init]
+
+cray_rocm_mpich_build:
+  extends: [.cray_resource1, .rocm_mpich, .build_and_test]
+  needs: [cray_rocm_mpich_tpls]
+
+cray_rocm_mpich_test:
+  extends: [.cray_resource1, .rocm_mpich, .run_ats]
+  needs: [cray_rocm_mpich_build]
+
+cray_rocm_mpich_perf:
+  extends: [.cray_shell2, .rocm_mpich, .run_perf, .merge_pr_rule]
+  needs: [cray_rocm_mpich_build]
 
-blueos_gcc_spectrum_build:
-  extends: [.blueos_resource1, .gcc_spectrum, .build_and_test]
+cray_rocm_mpich_cleanup:
+  extends: [.cray_resource1, .rocm_mpich, .cleanup_dir]
 
-blueos_gcc_spectrum_test:
-  extends: [.blueos_resource1, .gcc_spectrum, .run_ats]
-  needs: [blueos_gcc_spectrum_build]
 
 
+cray_hip_rocm_mpich_init:
+  extends: [.cray_shell1, .hip_rocm_mpich, .init]
 
-blueos_cuda_11_gcc_spectrum_build:
-  extends: [.blueos_resource2, .cuda_11_gcc_spectrum, .build_and_test]
+cray_hip_rocm_mpich_tpls:
+  extends: [.cray_resource2, .hip_rocm_mpich, .tpls]
+  needs: [cray_hip_rocm_mpich_init]
 
-blueos_cuda_11_gcc_spectrum_test:
-  extends: [.blueos_resource2, .cuda_11_gcc_spectrum, .run_ats]
-  needs: [blueos_cuda_11_gcc_spectrum_build]
-  allow_failure: true
+cray_hip_rocm_mpich_build:
+  extends: [.cray_resource2, .hip_rocm_mpich, .build_and_test]
+  needs: [cray_hip_rocm_mpich_tpls]
 
+cray_hip_rocm_mpich_test:
+  extends: [.cray_resource2, .hip_rocm_mpich, .run_ats]
+  needs: [cray_hip_rocm_mpich_build]
 
+cray_hip_rocm_mpich_perf:
+  extends: [.cray_shell2, .hip_rocm_mpich, .run_perf, .merge_pr_rule]
+  needs: [cray_hip_rocm_mpich_build]
 
+cray_hip_rocm_mpich_cleanup:
+  extends: [.cray_resource2, .hip_rocm_mpich, .cleanup_dir]

.gitlab/jobs-prod.yml

@@ -4,8 +4,8 @@
 toss_update_tpls:
   extends: [.toss_resource2, .update_tpls, .merge_pr_rule]
 
-blueos_update_tpls:
-  extends: [.blueos_resource2, .update_tpls, .merge_pr_rule]
+cray_update_tpls:
+  extends: [.cray_resource2, .update_tpls, .merge_pr_rule]
   needs: [toss_update_tpls]
 
 # ------------------------------------------------------------------------------
@@ -34,6 +34,9 @@ toss_release_permissions:
 # ------------------------------------------------------------------------------
 # CLEAN OLD BUILD DIRS
 
-cleanup_build_dirs:
-  extends: [.clean_dirs]
+cleanup_old_dirs_toss:
+  extends: [.toss_resource_general, .clean_old_dirs]
+
+cleanup_old_dirs_cray:
+  extends: [.cray_resource_general, .clean_old_dirs]
 

.gitlab/jobs-seq.yml

@@ -1,25 +1,63 @@
 # ------------------------------------------------------------------------------
 # BUILD JOBS
 
+toss_gcc_~mpi_init:
+  extends: [.gcc_~mpi, .init, .toss_shell1]
+
+toss_gcc_~mpi_tpls:
+  extends: [.gcc_~mpi, .tpls, .toss_resource1]
+  needs: [toss_gcc_~mpi_init]
+
 toss_gcc_~mpi_build:
   extends: [.gcc_~mpi, .build_and_test, .toss_resource1]
-
+  needs: [toss_gcc_~mpi_tpls]
+
 toss_gcc_~mpi_test:
   extends: [.gcc_~mpi, .run_ats, .toss_resource1]
   needs: [toss_gcc_~mpi_build]
 
+toss_gcc_~mpi_cleanup:
+  extends: [.gcc_~mpi, .cleanup_dir, .toss_resource1]
+  needs: [toss_gcc_~mpi_test]
+
+
+
+cray_hip_rocm_~mpi_init:
+  extends: [.cray_shell1, .hip_rocm_~mpi, .init]
+
+cray_hip_rocm_~mpi_tpls:
+  extends: [.cray_resource2, .hip_rocm_~mpi, .tpls]
+  needs: [cray_hip_rocm_~mpi_init]
+
+cray_hip_rocm_~mpi_build:
+  extends: [.cray_resource2, .hip_rocm_~mpi, .build_and_test]
+  needs: [cray_hip_rocm_~mpi_tpls]
+
+cray_hip_rocm_~mpi_test:
+  extends: [.cray_resource2, .hip_rocm_~mpi, .run_ats]
+  needs: [cray_hip_rocm_~mpi_build]
+
+cray_hip_rocm_~mpi_cleanup:
+  extends: [.cray_resource2, .hip_rocm_~mpi, .cleanup_dir]
+  needs: [cray_hip_rocm_~mpi_test]
+
+
 
-blueos_cuda_11_gcc_~mpi_build:
-  extends: [.blueos_resource2, .cuda_11_gcc_~mpi, .build_and_test]
+cray_rocm_~mpi_Debug_init:
+  extends: [.cray_shell1, .rocm_~mpi_Debug, .init]
 
-blueos_cuda_11_gcc_~mpi_test:
-  extends: [.blueos_resource2, .cuda_11_gcc_~mpi, .run_ats]
-  needs: [blueos_cuda_11_gcc_~mpi_build]
+cray_rocm_~mpi_Debug_tpls:
+  extends: [.cray_resource1, .rocm_~mpi_Debug, .tpls]
+  needs: [cray_rocm_~mpi_Debug_init]
 
+cray_rocm_~mpi_Debug_build:
+  extends: [.cray_resource1, .rocm_~mpi_Debug, .build_and_test]
+  needs: [cray_rocm_~mpi_Debug_tpls]
 
-blueos_gcc_~mpi_Debug_build:
-  extends: [.blueos_resource1, .gcc_~mpi_Debug, .build_and_test]
+cray_rocm_~mpi_Debug_test:
+  extends: [.cray_resource1, .rocm_~mpi_Debug, .run_ats]
+  needs: [cray_rocm_~mpi_Debug_build]
 
-blueos_gcc_~mpi_Debug_test:
-  extends: [.blueos_resource1, .gcc_~mpi_Debug, .run_ats]
-  needs: [blueos_gcc_~mpi_Debug_build]
+cray_rocm_~mpi_Debug_cleanup:
+  extends: [.cray_resource1, .rocm_~mpi_Debug, .cleanup_dir]
+  needs: [cray_rocm_~mpi_Debug_test]

.gitlab/machines.yml

@@ -1,35 +1,67 @@
 # ------------------------------------------------------------------------------
 # MACHINE TEMPLATES
 
+.on_tioga:
+  tags:
+    - tioga
+    - flux
+  variables:
+    SCHEDULER_ACTION: alloc
+    SCHEDULER_PARAMETERS: "--exclusive -N 2 -t 120"
+    NPROC: 128
+    HOSTNAME: 'tioga'
+  timeout: 120 minutes
+  extends: [.on_toss_4_x86_cray]
+
+.tioga_shell:
+  tags:
+    - tioga
+    - shell
+  variables:
+    ENVIRONMENT: "INTERACTIVE"
+  extends: [.on_toss_4_x86_cray]
+
 .on_ruby:
   tags:
     - ruby
-    - shell
+    - batch
   variables:
+    SCHEDULER_ACTION: allocate
+    SCHEDULER_PARAMETERS: "--res=ci --exclusive -N 2 -t 120"
+    NPROC: 112
     HOSTNAME: 'ruby'
-    PARTITION: pdebug
-    BUILD_ALLOC: srun -N 1 -c 36 -p pdebug -t 60
-    TEST_ALLOC: ''
+  timeout: 120 minutes
   extends: [.on_toss_4_x86]
 
-.on_lassen:
+.ruby_shell:
   tags:
-    - lassen
+    - ruby
     - shell
   variables:
-    HOSTNAME: 'lassen'
-    BUILD_ALLOC: lalloc 1 -W 60
-    TEST_ALLOC: $BUILD_ALLOC
-    LC_MODULES: "cuda/11.1.0"
-  extends: [.on_blueos_3_ppc64]
+    ENVIRONMENT: "INTERACTIVE"
+  extends: [.on_toss_4_x86]
 
 # ------------------------------------------------------------------------------
 
 .toss_resource_general:
   extends: [.on_ruby]
 
-.blueos_resource_general:
-  extends: [.on_lassen]
+.cray_resource_general:
+  extends: [.on_tioga]
+
+.toss_shell1:
+  extends: [.ruby_shell]
+
+# Use for performance tests
+.toss_shell2:
+  resource_group: toss2
+  extends: [.ruby_shell]
+
+.cray_shell1:
+  extends: [.tioga_shell]
+
+.cray_shell2:
+  extends: [.tioga_shell]
 
 # ------------------------------------------------------------------------------
 #
@@ -41,11 +73,14 @@
   resource_group: toss2
   extends: [.toss_resource_general]
 
-.blueos_resource1:
-  #resource_group: blueos1
-  extends: [.blueos_resource_general]
+.toss_resource3:
+  resource_group: toss3
+  extends: [.toss_resource_general]
 
-.blueos_resource2:
-  #resource_group: blueos2
-  extends: [.blueos_resource_general]
+.cray_resource1:
+  #resource_group: cray1
+  extends: [.cray_resource_general]
 
+.cray_resource2:
+  #resource_group: cray2
+  extends: [.cray_resource_general]