Removed GCC_VERSION, CLANG_VERSION, and ROCMCC_VERSION since these must be defined in the spack environment, or, in our case, we simply limit the compilers defined in the compiler.yaml file in configs

Author: ldowen

.gitlab/os.yml

@@ -10,16 +10,13 @@
 .on_toss_4_x86:
   variables:
     ARCH: 'toss_4_x86_64_ib'
-    GCC_VERSION: '10.3.1'
-    CLANG_VERSION: '14.0.6'
     SPHERAL_BUILDS_DIR: /p/lustre1/sphapp/spheral-ci-builds
     RUN_CMD: 'srun'
   extends: [.sys_config]
 
 .on_toss_4_x86_cray:
   variables:
     ARCH: 'toss_4_x86_64_ib_cray'
-    ROCMCC_VERSION: '6.2.0'
     SPHERAL_BUILDS_DIR: /p/lustre1/sphapp/spheral-ci-builds
     RUN_CMD: 'flux run'
   extends: [.sys_config]

.gitlab/specs.yml

@@ -3,60 +3,60 @@
 
 .gcc_mvapich2_cxxonly:
   variables:
-    SPEC: '%gcc@$GCC_VERSION+mpi'
+    SPEC: '%gcc+mpi'
     EXTRA_CMAKE_ARGS: '-DENABLE_CXXONLY=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_mvapich2:
   variables:
-    SPEC: '%gcc@$GCC_VERSION+mpi'
+    SPEC: '%gcc+mpi'
     EXTRA_CMAKE_ARGS: '-DENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi:
   variables:
-    SPEC: '%gcc@$GCC_VERSION~mpi'
+    SPEC: '%gcc~mpi'
     EXTRA_CMAKE_ARGS: '-DENABLE_DOCS=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_~mpi_Debug:
   variables:
-    SPEC: '%gcc@$GCC_VERSION~mpi'
+    SPEC: '%gcc~mpi'
     EXTRA_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DENABLE_WARNINGS_AS_ERRORS=On'
 
 
 .clang_mvapich2:
   variables:
-    SPEC: '%clang@$CLANG_VERSION+mpi'
+    SPEC: '%clang+mpi'
     EXTRA_CMAKE_ARGS: '-DENABLE_WARNINGS_AS_ERRORS=On -DENABLE_DEV_BUILD=On'
 
 
 
 .cuda_11_gcc_~mpi:
   variables:
-    SPEC: '%gcc@$GCC_VERSION~mpi+cuda cuda_arch=70'
+    SPEC: '%gcc~mpi+cuda cuda_arch=70'
 
 .cuda_11_gcc_spectrum:
   variables:
-    SPEC: '%gcc@$GCC_VERSION+mpi+cuda cuda_arch=70'
+    SPEC: '%gcc+mpi+cuda cuda_arch=70'
     EXTRA_CMAKE_ARGS: ''
 
 
 
 .rocm_mpich:
   variables:
-    SPEC: '%rocmcc@$ROCMCC_VERSION+mpi~rocm'
+    SPEC: '%rocmcc+mpi~rocm'
 
 .rocm_~mpi:
   variables:
-    SPEC: '%rocmcc@$ROCMCC_VERSION~mpi~rocm'
+    SPEC: '%rocmcc~mpi~rocm'
 
 .rocm_~mpi_Debug:
   variables:
-    SPEC: '%rocmcc@$ROCMCC_VERSION~mpi~rocm'
+    SPEC: '%rocmcc~mpi~rocm'
     EXTRA_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .hip_rocm_mpich:
   variables:
-    SPEC: '%rocmcc@$ROCMCC_VERSION+mpi+rocm amdgpu_target=gfx942'
+    SPEC: '%rocmcc+mpi+rocm amdgpu_target=gfx942'
 
 .hip_rocm_~mpi:
   variables:
-    SPEC: '%rocmcc@$ROCMCC_VERSION~mpi+rocm amdgpu_target=gfx942'
+    SPEC: '%rocmcc~mpi+rocm amdgpu_target=gfx942'