Merge branch 'develop' into update-ramble

LLNL · Jan 17, 2025 · a53b89b · a53b89b
2 parents 401f1a8 + 3a5a443
commit a53b89b
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 6 deletions.
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
@@ -88,8 +88,8 @@ legacy_test_run:
         - .gitlab-ci.yml
         - .gitlab/ci/*
         - experiments/**
-        - systems/${LEGACY_ARCHCONFIG}/**
-        - repo/${LEGACY_BENCHMARK}/**
+        - systems/$LEGACY_ARCHCONFIG/**
+        - repo/$LEGACY_BENCHMARK/**
         - modifiers/**
         - var/**
         - lib/**
@@ -125,8 +125,8 @@ test_run:
         - .gitlab-ci.yml
         - .gitlab/ci/*
         - experiments/**
-        - systems/${ARCHCONFIG}/**
-        - repo/${BENCHMARK}/**
+        - systems/$ARCHCONFIG/**
+        - repo/$BENCHMARK/**
         - modifiers/**
         - var/**
         - lib/**

diff --git a/systems/llnl-cluster/externals/base/00-packages.yaml b/systems/llnl-cluster/externals/base/00-packages.yaml
@@ -4,11 +4,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 packages:
+  elfutils:
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+    buildable: false
   papi:
     buildable: false
     externals:
     - spec: papi@6.0.0.1
       prefix: /usr/tce/packages/papi/papi-6.0.0.1
+  unwind:
+    externals:
+    - spec: unwind@8.0.1
+      prefix: /usr
+    buildable: false
   tar:
     buildable: false
     externals:

diff --git a/systems/llnl-elcapitan/externals/base/00-packages.yaml b/systems/llnl-elcapitan/externals/base/00-packages.yaml
@@ -43,6 +43,21 @@ packages:
     - spec: cmake@3.24.2
       prefix: /usr/tce
     buildable: false
+  elfutils:
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+    buildable: false
+  papi:
+    externals:
+    - spec: papi@5.6.0.0
+      prefix: /usr
+    buildable: false
+  unwind:
+    externals:
+    - spec: unwind@8.0.1
+      prefix: /usr
+    buildable: false
   pkgconf:
     externals:
     - spec: pkgconf@1.4.2

diff --git a/systems/llnl-elcapitan/system.py b/systems/llnl-elcapitan/system.py
@@ -105,8 +105,30 @@ def external_pkg_configs(self):
         elif self.spec.satisfies("compiler=gcc"):
             selections.append(externals / "libsci" / "00-gcc-packages.yaml")
 
+        cmp_preference_path = self.next_adhoc_cfg()
+        with open(cmp_preference_path, "w") as f:
+            f.write(self.compiler_weighting_cfg())
+        selections.append(cmp_preference_path)
+
         return selections
 
+    def compiler_weighting_cfg(self):
+        compiler = self.spec.variants["compiler"][0]
+
+        if compiler == "cce":
+            return """\
+packages:
+  all:
+    require:
+    - one_of: ["%cce", "@:"]
+"""
+        elif compiler == "gcc":
+            return """\
+packages: {}
+"""
+        else:
+            raise ValueError(f"Unexpected value for compiler: {compiler}")
+
     def compiler_configs(self):
         compilers = LlnlElcapitan.resource_location / "compilers"
 
@@ -118,8 +140,10 @@ def compiler_configs(self):
                     self.rocm_cce_compiler_cfg(self.spec.variants["rocm"][0], "16.0.0")
                 )
             selections.append(compiler_cfg_path)
-        elif self.spec.satisfies("compiler=gcc"):
-            selections.append(compilers / "gcc" / "00-gcc-12-compilers.yaml")
+
+        # Note: this is always included for some low-level dependencies
+        # that shouldn't build with %cce
+        selections.append(compilers / "gcc" / "00-gcc-12-compilers.yaml")
 
         return selections
 

diff --git a/systems/llnl-sierra/externals/base/00-packages.yaml b/systems/llnl-sierra/externals/base/00-packages.yaml
@@ -4,6 +4,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 packages:
+  elfutils:
+    externals:
+    - spec: elfutils@0.176
+      prefix: /usr
+    buildable: false
+  papi:
+    buildable: false
+    externals:
+    - spec: papi@5.2.0.0
+      prefix: /usr
+  unwind:
+    externals:
+    - spec: unwind@8.0.1
+      prefix: /usr
+    buildable: false
   tar:
     externals:
     - spec: tar@1.26