Bug fix in Narwhal compiler config, and update of Gaea C5 config

JCSDA · Jan 18, 2023 · 9d19966 · 9d19966
1 parent d31c593
commit 9d19966
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/configs/sites/gaea-c5/compilers.yaml b/configs/sites/gaea-c5/compilers.yaml
@@ -13,6 +13,7 @@ compilers:
     - PrgEnv-intel/8.3.3
     - intel/2022.0.2
     - craype/2.7.15
+    - libfabric/1.11.0.4.128
     environment:
       prepend_path:
         PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'

diff --git a/configs/sites/gaea-c5/packages.yaml b/configs/sites/gaea-c5/packages.yaml
@@ -16,7 +16,7 @@
     python:
       buildable: false
       externals:
-      - spec: [email protected] +bz2 +ctypes +dbm ~debug +libxml2 +lzma ~nis ~optimizations +pic +pyexpat +pythoncmd +readline +shared +sqlite3 +ssl ~tix ~tkinter +uuid +zlib
+      - spec: [email protected]
         modules: [python/3.9.12]
     autoconf:
       externals:
@@ -38,10 +38,16 @@
       externals:
       - spec: [email protected]
         prefix: /usr
-    bzip2:
+    # Don't use, it's missing the headers
+    #bzip2:
+    #  externals:
+    #  - spec: [email protected]
+    #    prefix: /usr
+    cmake:
+      buildable: false
       externals:
-      - spec: [email protected]
-        prefix: /usr
+      - spec: [email protected]
+        modules: [cmake/3.23.1]
     coreutils:
       externals:
       - spec: [email protected]
@@ -92,11 +98,6 @@
       externals:
       - spec: [email protected]
         prefix: /usr
-    cmake:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        modules: [cmake/3.23.1]
     git:
       buildable: false
       externals:
@@ -119,12 +120,20 @@
       externals:
       - spec: [email protected]
         prefix: /usr
+  # This package is incomplete, but still works for us
+  krb5:
+    externals:
+    - spec: [email protected]
+      #prefix: /usr/lib/mit
+      prefix: /usr
     libfuse:
       externals:
       - spec: [email protected]
         prefix: /usr
       - spec: [email protected]
         prefix: /usr
+    libtirpc:
+      variants: ~gssapi
     libtool:
       externals:
       - spec: [email protected]

diff --git a/configs/sites/narwhal/compilers.yaml b/configs/sites/narwhal/compilers.yaml
@@ -11,7 +11,7 @@ compilers::
       target: any
       modules:
       - PrgEnv-intel/8.3.2
-      - intel/2021.3.0
+      - intel-classic/2021.3.0
       environment:
         prepend_path:
           PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'