Update ramble version (#523)

* update ramble version and use basicmodifier * remove some dryruns and bug fixes * remove hpl dryrun * remove spackapplication now executableapplication * redefine name due to ramble changes * update ramble version to remove dependency on redefining name * remove whitespace * remove a few more legacy dryruns * remove foms flag, no longer necessary * woops missed a fom flag * Update run.yml * Update run.yml * Update run.yml * Update run.yml * Update run.yml * Update run.yml * fix import in babelstream --------- Co-authored-by: pearce8 <[email protected]> Co-authored-by: Stephanie Brink <[email protected]>
LLNL · Jan 30, 2025 · 910b6d8 · 910b6d8
1 parent b9d39d0
commit 910b6d8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 49 deletions.
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
@@ -196,26 +196,6 @@ jobs:
             --disable-logger \
             workspace setup --dry-run
 
-      - name: Dry run lammps/openmp with static Ruby
-        run: |
-          ./bin/benchpark setup lammps/openmp LLNL-Ruby-icelake-OmniPath workspace/
-          . workspace/setup.sh
-          ramble \
-            --workspace-dir workspace/lammps/openmp/LLNL-Ruby-icelake-OmniPath/workspace \
-            --disable-progress-bar \
-            --disable-logger \
-            workspace setup --dry-run
-
-      - name: Dry run lammps/rocm with static Tioga
-        run: |
-          ./bin/benchpark setup lammps/rocm LLNL-Tioga-HPECray-zen3-MI250X-Slingshot workspace/
-          . workspace/setup.sh
-          ramble \
-            --workspace-dir workspace/lammps/rocm/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/workspace \
-            --disable-progress-bar \
-            --disable-logger \
-            workspace setup --dry-run
-
       - name: Dry run dynamic lammps/openmp on static Ruby
         run: |
           ./bin/benchpark experiment init --dest=lammps-openmp lammps+openmp
@@ -238,16 +218,6 @@ jobs:
             --disable-logger \
             workspace setup --dry-run
 
-      - name: Dry run hpl/openmp with Caliper-topdown modifier on Magma
-        run: |
-          ./bin/benchpark setup hpl/openmp --modifier=caliper-topdown LLNL-Magma-Penguin-icelake-OmniPath workspace/
-          . workspace/setup.sh
-          ramble \
-            --workspace-dir workspace/hpl/openmp/LLNL-Magma-Penguin-icelake-OmniPath/workspace \
-            --disable-progress-bar \
-            --disable-logger \
-            workspace setup --dry-run
-
       - name: Dry run dynamic quicksilver-openmp on nosite-x86_64 with allocation modifier
         run: |
           ./bin/benchpark experiment init --dest=quicksilver-openmp quicksilver+openmp +weak~single_node
@@ -258,17 +228,7 @@ jobs:
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
-
-      - name: Dry run phloem/mpi-only on nosite-x86_64 with allocation modifier
-        run: |
-          ./bin/benchpark setup phloem/mpi-only nosite-x86_64 workspace/
-          . workspace/setup.sh
-          ramble \
-            --workspace-dir workspace/phloem/mpi-only/nosite-x86_64/workspace \
-            --disable-progress-bar \
-            --disable-logger \
-            workspace setup --dry-run
-
+      
       - name: Dry run salmon/openmp with allocation modifier on Fugaku
         run: |
           ./bin/benchpark setup salmon/openmp RCCS-Fugaku-Fujitsu-A64FX-TofuD workspace/
@@ -288,7 +248,7 @@ jobs:
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
-
+            
       - name: Dry run qws/openmp with allocation modifier on nosite-x86_64
         run: |
           ./bin/benchpark setup qws/openmp nosite-x86_64 workspace/
@@ -298,6 +258,7 @@ jobs:
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
+
   dynamicdryrunexperiments:
     runs-on: ubuntu-22.04
     steps:

diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
@@ -107,7 +107,7 @@ legacy_test_run:
     - ramble --workspace-dir . --disable-progress-bar --disable-logger
       on --executor '{execute_experiment}' --where '{n_nodes} == 1'
     # Analyze Experiments
-    - ramble --workspace-dir . --disable-progress-bar workspace analyze --always-print-foms --format json yaml text
+    - ramble --workspace-dir . --disable-progress-bar workspace analyze --format json yaml text
     # Check Experiment Exit Codes
     - cd -
     - python ./.gitlab/ci/bin/exit-codes ./workspace/${LEGACY_BENCHMARK}/${LEGACY_VARIANT}/${LEGACY_ARCHCONFIG}/workspace/results.latest.json
@@ -155,7 +155,7 @@ test_run:
     - ramble --workspace-dir . --disable-progress-bar --disable-logger
       on --executor '{execute_experiment}' --where '{n_nodes} == 1'
     # Analyze Experiments
-    - ramble --workspace-dir . --disable-progress-bar workspace analyze --always-print-foms --format json yaml text
+    - ramble --workspace-dir . --disable-progress-bar workspace analyze --format json yaml text
     # Check Experiment Exit Codes
     - cd -
     - python ./.gitlab/ci/bin/exit-codes ./workspace/${BENCHMARK}-benchmark/${system_id}/workspace/results.latest.json
diff --git a/checkout-versions.yaml b/checkout-versions.yaml
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 versions:
-  ramble: a838e7f     # develop on 7/17/2024 (newer than 0.5.0 release)
+  ramble: f5970aa     # develop on 1/08/2025 (newer than 0.5.0 release)
   spack: 0b3b49b      # develop-2024-06-28 (newer than 0.22.0 release)
diff --git a/legacy/experiments/laghos/mpi-only/ramble.yaml b/legacy/experiments/laghos/mpi-only/ramble.yaml
@@ -21,7 +21,7 @@ ramble:
   applications:
     laghos:
       workloads:
-        problem:
+        triplept:
           env_vars:
           variables:
             n_nodes: ['1', '2', '4', '8', '16', '32', '64', '128']

diff --git a/modifiers/caliper/modifier.py b/modifiers/caliper/modifier.py
@@ -21,7 +21,7 @@ def add_mode(mode_name, mode_option, description):
     )
 
 
-class Caliper(SpackModifier):
+class Caliper(BasicModifier):
     """Define a modifier for Caliper"""
 
     name = "caliper"

diff --git a/repo/babelstream/application.py b/repo/babelstream/application.py
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import sys
+import os
 
 from ramble.appkit import *
 from ramble.expander import Expander

diff --git a/repo/genesis/application.py b/repo/genesis/application.py
@@ -7,7 +7,7 @@
 
 import sys
 
-class Genesis(SpackApplication):
+class Genesis(ExecutableApplication):
     """GENESIS package contains two MD programs (atdyn and spdyn), trajectory
     analysis programs, and other useful tools. GENESIS (GENeralized-Ensemble
     SImulation System) has been developed mainly by Sugita group in RIKEN-CCS.

diff --git a/repo/salmon-tddft/application.py b/repo/salmon-tddft/application.py
@@ -8,7 +8,7 @@
 from ramble.appkit import *
 
 
-class SalmonTddft(SpackApplication):
+class SalmonTddft(ExecutableApplication):
     """Salmon-tddft benchmark"""
     name = "salmon-tddft"