Update context output format to reduce duplication

rfbgo · Apr 4, 2024 · f799b6d · f799b6d
1 parent 5dce905
commit f799b6d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/lib/ramble/ramble/application.py b/lib/ramble/ramble/application.py
@@ -1427,8 +1427,7 @@ def format_context(context_match, context_format):
                     if group[1]:
                         context_val[group[1]] = context_match[group[1]]
 
-            context_string = context_format.replace('{', '').replace('}', '') \
-                + ' = ' + context_format.format(**context_val)
+            context_string = context_format.format(**context_val)
             return context_string
 
         fom_values = {}

diff --git a/var/ramble/repos/builtin/applications/cloverleaf/application.py b/var/ramble/repos/builtin/applications/cloverleaf/application.py
@@ -82,7 +82,7 @@ class Cloverleaf(SpackApplication):
 
     figure_of_merit_context('step',
                             regex=step_count_regex,
-                            output_format='{step}')
+                            output_format='Step {step}')
 
     step_summary_regex = (r'\s*step:\s+(?P<step>[0-9]+)\s+' +
                           r'(?P<volume>'          + floating_point_regex + r')\s+' +

diff --git a/var/ramble/repos/builtin/applications/hpl/application.py b/var/ramble/repos/builtin/applications/hpl/application.py
@@ -202,7 +202,7 @@ class Hpl(SpackApplication):
                     group_name='gflops', units='GFLOP/s',
                     contexts=['problem-name'])
 
-    figure_of_merit_context('problem-name', regex=r'.*\s+(?P<N>[0-9]+)\s+(?P<NB>[0-9]+)\s+(?P<P>[0-9]+)\s+(?P<Q>[0-9]+)\s+(?P<time>[0-9]+\.[0-9]+)\s+(?P<gflops>[0-9].*)\n', output_format='{N}-{NB}-{P}-{Q}')
+    figure_of_merit_context('problem-name', regex=r'.*\s+(?P<N>[0-9]+)\s+(?P<NB>[0-9]+)\s+(?P<P>[0-9]+)\s+(?P<Q>[0-9]+)\s+(?P<time>[0-9]+\.[0-9]+)\s+(?P<gflops>[0-9].*)\n', output_format='N-NB-P-Q = {N}-{NB}-{P}-{Q}')
 
     # Integer sqrt
     def _isqrt(self, n):

diff --git a/var/ramble/repos/builtin/applications/intel-hpl/application.py b/var/ramble/repos/builtin/applications/intel-hpl/application.py
@@ -203,7 +203,7 @@ class IntelHpl(SpackApplication):
                     group_name='gflops', units='GFLOP/s',
                     contexts=['problem-name'])
 
-    figure_of_merit_context('problem-name', regex=r'.*\s+(?P<N>[0-9]+)\s+(?P<NB>[0-9]+)\s+(?P<P>[0-9]+)\s+(?P<Q>[0-9]+)\s+(?P<time>[0-9]+\.[0-9]+)\s+(?P<gflops>[0-9].*)\n', output_format='{N}-{NB}-{P}-{Q}')
+    figure_of_merit_context('problem-name', regex=r'.*\s+(?P<N>[0-9]+)\s+(?P<NB>[0-9]+)\s+(?P<P>[0-9]+)\s+(?P<Q>[0-9]+)\s+(?P<time>[0-9]+\.[0-9]+)\s+(?P<gflops>[0-9].*)\n', output_format='N-NB-P-Q = {N}-{NB}-{P}-{Q}')
 
     # Integer sqrt
     def _isqrt(self, n):

diff --git a/var/ramble/repos/builtin/applications/ior/application.py b/var/ramble/repos/builtin/applications/ior/application.py
@@ -64,7 +64,7 @@ class Ior(SpackApplication):
 
     access_regex = '(?P<access>(read|write))' + iter_regex
     figure_of_merit_context('iter', regex=access_regex,
-                            output_format='{iter}')
+                            output_format='iter {iter}')
 
     log_str = Expander.expansion_str('log_file')