From 9347a7a8efd5be0d0973bd5419b826c7331c39f1 Mon Sep 17 00:00:00 2001
From: Jose Gracia <gracia@hlrs.de>
Date: Mon, 1 Jul 2024 09:29:51 -0500
Subject: [PATCH] Define compilers in terms of CPE wrappers and modules

---
 config-hlrs/compilers.yaml | 41 +++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/config-hlrs/compilers.yaml b/config-hlrs/compilers.yaml
index bec1b9c..268dc60 100644
--- a/config-hlrs/compilers.yaml
+++ b/config-hlrs/compilers.yaml
@@ -2,14 +2,31 @@ compilers:
 - compiler:
     spec: cce@=18.0.0
     paths:
-      cc: /opt/cray/pe/cce/18.0.0/bin/craycc
-      cxx: /opt/cray/pe/cce/18.0.0/bin/crayCC
-      f77: /opt/cray/pe/cce/18.0.0/bin/crayftn
-      fc: /opt/cray/pe/cce/18.0.0/bin/crayftn
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
     flags: {}
     operating_system: sles15
     target: x86_64
-    modules: []
+    modules:
+    - PrgEnv-cray
+    - cce/18.0
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=13.2.1
+    paths:
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
+    flags: {}
+    operating_system: sles15
+    target: x86_64
+    modules:
+    - PrgEnv-gnu
+    - gcc-native/13.2
     environment: {}
     extra_rpaths: []
 - compiler:
@@ -25,16 +42,4 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
-- compiler:
-    spec: gcc@=13.2.1
-    paths:
-      cc: /opt/cray/pe/gcc-native/13/bin/gcc
-      cxx: /opt/cray/pe/gcc-native/13/bin/g++
-      f77: /opt/cray/pe/gcc-native/13/bin/gfortran
-      fc: /opt/cray/pe/gcc-native/13/bin/gfortran
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules: []
-    environment: {}
-    extra_rpaths: []
+