From a810b08a0cc821cdcf8e8dd3b78efc7fd9065f36 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Mon, 13 Mar 2023 19:34:23 -0400
Subject: [PATCH] ci,spock,crusher: migrate build to crusher

---
 .gitlab-ci.yml                        |  4 ++--
 .gitlab/ci/{spock.yml => crusher.yml} | 30 +++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename .gitlab/ci/{spock.yml => crusher.yml} (84%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 421d4af3a..1e6a23dd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,7 @@
       when: on_success
     - when: never
 
-.run_spock_ci: &run_spock_ci
+.run_crusher_ci: &run_crusher_ci
   rules:
     - if: '$CI_PROJECT_PATH == "ci/csc331_crusher/dev/vtk-m"'
       when: on_success
@@ -214,7 +214,7 @@ stages:
 
 include:
   - local: '/.gitlab/ci/ascent.yml'
-  - local: '/.gitlab/ci/spock.yml'
+  - local: '/.gitlab/ci/crusher.yml'
   - local: '/.gitlab/ci/centos7.yml'
   - local: '/.gitlab/ci/centos8.yml'
   - local: '/.gitlab/ci/doxygen.yml'
diff --git a/.gitlab/ci/spock.yml b/.gitlab/ci/crusher.yml
similarity index 84%
rename from .gitlab/ci/spock.yml
rename to .gitlab/ci/crusher.yml
index 7d53c14e0..3b0b9c83f 100644
--- a/.gitlab/ci/spock.yml
+++ b/.gitlab/ci/crusher.yml
@@ -1,5 +1,5 @@
 # Ad-hoc build that runs in the ECP Hardware, concretely in OLCF Spock.
-.spock_gcc_hip:
+.crusher_gcc_hip:
   variables:
     CCACHE_BASEDIR:          "/gpfs/alpine/csc331/scratch/"
     CCACHE_DIR:              "/gpfs/alpine/csc331/scratch/vbolea/ci/vtk-m/ccache"
@@ -17,12 +17,12 @@
     KOKKOS_OPTS: >-
       -DCMAKE_INSTALL_PREFIX:PATH=$CI_BUILDS_DIR/kokkos_install
       -DCMAKE_CXX_COMPILER:FILEPATH=/opt/rocm-4.5.0/hip/bin/hipcc
-      -DKokkos_ARCH_VEGA908:BOOL=ON
+      -DKokkos_ARCH_VEGA90A:BOOL=ON
 
     # DefApps/default;craype;rocm;gcc should be loaded first
     JOB_MODULES: >-
       DefApps/default
-      craype-accel-amd-gfx908
+      craype-accel-amd-gfx90a
       rocm/4.5.0
       gcc/10
       cmake/3.22
@@ -30,7 +30,7 @@
       git-lfs
       ninja
       zstd
-    VTKM_SETTINGS: kokkos+hip+gfx908+spock+ccache+no_rendering
+    VTKM_SETTINGS: kokkos+hip+gfx90a+crusher+ccache+no_rendering
   interruptible: true
 
 .setup_env_ecpci: &setup_env_ecpci |
@@ -39,12 +39,12 @@
   module list
   export PATH="${CCACHE_INSTALL_DIR}/ccache:$PATH"
 
-build:spock_gcc_hip:
+build:crusher_gcc_hip:
   stage: build
-  tags: [spock, shell, olcf-spock-shell-02]
+  tags: [crusher, shell]
   extends:
-    - .spock_gcc_hip
-    - .run_spock_ci
+    - .crusher_gcc_hip
+    - .run_crusher_ci
   before_script:
     - *setup_env_ecpci
     - mkdir -p "$CCACHE_INSTALL_DIR"
@@ -68,18 +68,18 @@ build:spock_gcc_hip:
       - build/
       - .gitlab/ccache/ccache
 
-test:spock_gcc_hip:
+test:crusher_gcc_hip:
   stage: test
-  tags: [spock, slurm, olcf-spock-slurm-02]
+  tags: [crusher, slurm]
   extends:
-    - .spock_gcc_hip
-    - .run_spock_ci
+    - .crusher_gcc_hip
+    - .run_crusher_ci
   needs:
-    - build:spock_gcc_hip
+    - build:crusher_gcc_hip
   dependencies:
-    - build:spock_gcc_hip
+    - build:crusher_gcc_hip
   variables:
-    SCHEDULER_PARAMETERS: "-ACSC331 -pecp -t120 --nice=0 -c32 --gpus=4 -N 1"
+    SCHEDULER_PARAMETERS: "-ACSC331 -pbatch -t120 --nice=0 -c32 --gpus=4 -N 1"
     # We need this to skip ctest_submit from being run inside a jsrun job
     GITLAB_CI_EMULATION: 1
     # Tests errors to address due to different env in Spock