Bring blueos gcc version back to 8.3.1

LLNL · Oct 22, 2024 · 9aa1a58 · 9aa1a58
1 parent 91694c8
commit 9aa1a58
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.gitlab/os.yml b/.gitlab/os.yml
@@ -18,7 +18,7 @@
 .on_blueos_3_ppc64:
   variables:
     ARCH: 'blueos_3_ppc64le_ib_p9'
-    GCC_VERSION: '10.2.1'
+    GCC_VERSION: '8.3.1'
     CLANG_VERSION: '9.0.0'
     SPHERAL_BUILDS_DIR: /p/gpfs1/sphapp/spheral-ci-builds
   extends: [.sys_config]

diff --git a/scripts/devtools/spec-list.json b/scripts/devtools/spec-list.json
@@ -7,9 +7,9 @@
       ]
     ,
     "blueos_3_ppc64le_ib_p9": [
-        "gcc@10.2.1",
-        "gcc@10.2.1+cuda~mpi cuda_arch=70",
-        "gcc@10.2.1+cuda cuda_arch=70"
+        "gcc@8.3.1",
+        "gcc@8.3.1+cuda~mpi cuda_arch=70",
+        "gcc@8.3.1+cuda cuda_arch=70"
       ]
   }
 }
diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib/compilers.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib/compilers.yaml
@@ -13,12 +13,12 @@ compilers:
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: gcc@10.2.1
+    spec: gcc@8.3.1
     paths:
-      cc: /usr/tce/packages/gcc/gcc-10.2.1/bin/gcc
-      cxx: /usr/tce/packages/gcc/gcc-10.2.1/bin/g++
-      f77: /usr/tce/packages/gcc/gcc-10.2.1/bin/gfortran
-      fc: /usr/tce/packages/gcc/gcc-10.2.1/bin/gfortran
+      cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran
     flags: {}
     operating_system: rhel7
     target: ppc64le

diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib/packages.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib/packages.yaml
@@ -39,8 +39,6 @@ packages:
     - 10.1.243
     buildable: false
     externals:
-    - spec: [email protected]+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.4.1
     - spec: [email protected]~allow-unsupported-compilers
       prefix: /usr/tce/packages/cuda/cuda-11.1.0
     - spec: [email protected]~allow-unsupported-compilers