From 9aa1a582cce1aedabe5d32bb1bf8bcf5a1087b03 Mon Sep 17 00:00:00 2001
From: Landon Owen <lndnwn9@gmail.com>
Date: Tue, 22 Oct 2024 10:04:21 -0700
Subject: [PATCH] Bring blueos gcc version back to 8.3.1

---
 .gitlab/os.yml                                         |  2 +-
 scripts/devtools/spec-list.json                        |  6 +++---
 .../spack/configs/blueos_3_ppc64le_ib/compilers.yaml   | 10 +++++-----
 .../spack/configs/blueos_3_ppc64le_ib/packages.yaml    |  2 --
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitlab/os.yml b/.gitlab/os.yml
index e7a6a8fda..9bc4b8146 100644
--- 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
index 395d5d0cd..59f681eb8 100644
--- 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
index 84c1b8b70..b876f15bc 100644
--- 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
index 54f6fd19c..7a8d3d6bf 100644
--- 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: cuda@11.4.1+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.4.1
     - spec: cuda@11.1.0~allow-unsupported-compilers
       prefix: /usr/tce/packages/cuda/cuda-11.1.0
     - spec: cuda@11.0.2~allow-unsupported-compilers