Merge pull request #938 from linsword13/regex

Make fom regex less greedy

Author: linsword13

var/ramble/repos/builtin/applications/architecture-check/application.py

@@ -74,7 +74,7 @@ class ArchitectureCheck(ExecutableApplication):
 
     workload_group("all_workloads", workloads=["standard"])
 
-    spack_regex = r"Spack tuple: (?P<platform>\S+)-(?P<os>\S+)-(?P<arch>\S+)"
+    spack_regex = r"Spack tuple: (?P<platform>\S+?)-(?P<os>\S+?)-(?P<arch>\S+)"
 
     figure_of_merit(
         "Spack Platform",

var/ramble/repos/builtin/applications/elk/application.py

@@ -69,7 +69,7 @@ class Elk(ExecutableApplication):
     success_criteria(
         "prints_done",
         mode="string",
-        match=r".*Elk code stopped.*",
+        match=r".*?Elk code stopped",
         file="{experiment_run_dir}/{experiment_name}.out",
     )
 
@@ -88,7 +88,7 @@ class Elk(ExecutableApplication):
         figure_of_merit(
             metric,
             log_file=output_file,
-            fom_regex=rf"\s*(?P<metric>{metric})\s+:\s+(?P<value>[0-9]+\.[0-9]*).*",
+            fom_regex=rf"\s*(?P<metric>{metric})\s+:\s+(?P<value>[0-9]+\.[0-9]*)",
             group_name="value",
             units="s",
         )

var/ramble/repos/builtin/applications/gromacs/application.py

@@ -392,7 +392,7 @@ class Gromacs(ExecutableApplication):
     figure_of_merit(
         "Core Time",
         log_file=log_str,
-        fom_regex=r"\s+Time:\s+(?P<core_time>[0-9]+\.[0-9]+).*",
+        fom_regex=r"\s+Time:\s+(?P<core_time>[0-9]+\.[0-9]+)",
         group_name="core_time",
         units="s",
         fom_type=FomType.TIME,
@@ -402,7 +402,7 @@ class Gromacs(ExecutableApplication):
         "Wall Time",
         log_file=log_str,
         fom_regex=r"\s+Time:\s+[0-9]+\.[0-9]+\s+"
-        + r"(?P<wall_time>[0-9]+\.[0-9]+).*",
+        + r"(?P<wall_time>[0-9]+\.[0-9]+)",
         group_name="wall_time",
         units="s",
         fom_type=FomType.TIME,
@@ -412,7 +412,7 @@ class Gromacs(ExecutableApplication):
         "Percent Core Time",
         log_file=log_str,
         fom_regex=r"\s+Time:\s+[0-9]+\.[0-9]+\s+[0-9]+\.[0-9]+\s+"
-        + r"(?P<perc_core_time>[0-9]+\.[0-9]+).*",
+        + r"(?P<perc_core_time>[0-9]+\.[0-9]+)",
         group_name="perc_core_time",
         units="%",
         fom_type=FomType.MEASURE,
@@ -421,7 +421,7 @@ class Gromacs(ExecutableApplication):
     figure_of_merit(
         "Nanosecs per day",
         log_file=log_str,
-        fom_regex=r"Performance:\s+" + r"(?P<ns_per_day>[0-9]+\.[0-9]+).*",
+        fom_regex=r"Performance:\s+" + r"(?P<ns_per_day>[0-9]+\.[0-9]+)",
         group_name="ns_per_day",
         units="ns/day",
         fom_type=FomType.THROUGHPUT,
@@ -431,7 +431,7 @@ class Gromacs(ExecutableApplication):
         "Hours per nanosec",
         log_file=log_str,
         fom_regex=r"Performance:\s+[0-9]+\.[0-9]+\s+"
-        + r"(?P<hours_per_ns>[0-9]+\.[0-9]+).*",
+        + r"(?P<hours_per_ns>[0-9]+\.[0-9]+)",
         group_name="hours_per_ns",
         units="hours/ns",
         fom_type=FomType.INFO,

var/ramble/repos/builtin/applications/hmmer/application.py

@@ -97,7 +97,7 @@ class Hmmer(ExecutableApplication):
 
     figure_of_merit(
         "Elapsed time",
-        fom_regex=r"# CPU.*Elapsed:\s+(?P<elapsed_time>[0-9]+:[0-9]+:[0-9]+\.*[0-9]*)\s*$",
+        fom_regex=r"# CPU.*?Elapsed:\s+(?P<elapsed_time>[0-9]+:[0-9]+:[0-9]+\.*[0-9]*)\s*$",
         group_name="elapsed_time",
         log_file=out_file,
         units="hms",

var/ramble/repos/builtin/applications/hostname/application.py

@@ -57,7 +57,7 @@ class Hostname(ExecutableApplication):
 
     figure_of_merit(
         "possible hostname",
-        fom_regex=r"(?P<hostname>\S+)\s*",
+        fom_regex=r"(?P<hostname>\S+)",
         group_name="hostname",
         units="",
     )

var/ramble/repos/builtin/applications/intel-mpi-benchmarks/application.py

@@ -273,5 +273,5 @@ class IntelMpiBenchmarks(ExecutableApplication):
     success_criteria(
         "run_to_completion",
         mode="string",
-        match=r".*All processes entering MPI_Finalize",
+        match=r".*?All processes entering MPI_Finalize",
     )

var/ramble/repos/builtin/applications/iperf2/application.py

@@ -106,7 +106,7 @@ class Iperf2(ExecutableApplication):
     figure_of_merit(
         "Total BW",
         log_file=log_str,
-        fom_regex=r"\[SUM\]\s.*sec\s.*GBytes\s(?P<bw>.*)\sGbits/sec.*",
+        fom_regex=r"\[SUM\]\s.*?sec\s.*?GBytes\s(?P<bw>.*)\sGbits/sec",
         group_name="bw",
         units="Gbits/sec",
     )

var/ramble/repos/builtin/applications/lammps/application.py

@@ -316,21 +316,21 @@ class Lammps(ExecutableApplication):
     )
     figure_of_merit(
         "Nanoseconds per day",
-        fom_regex=r"Performance.*\s+(?P<nspd>[0-9\.]+) (ns|tau)/day",
+        fom_regex=r"Performance.*?\s+(?P<nspd>[0-9\.]+) (ns|tau)/day",
         group_name="nspd",
         units="ns/day",
         fom_type=FomType.THROUGHPUT,
     )
     figure_of_merit(
         "Hours per nanosecond",
-        fom_regex=r"Performance.*\s+(?P<hpns>[0-9\.]+) hours/ns",
+        fom_regex=r"Performance.*?\s+(?P<hpns>[0-9\.]+) hours/ns",
         group_name="hpns",
         units="hours/ns",
         fom_type=FomType.TIME,
     )
     figure_of_merit(
         "Timesteps per second",
-        fom_regex=r"Performance.*\s+(?P<tsps>[0-9\.]+) timesteps/s",
+        fom_regex=r"Performance.*?\s+(?P<tsps>[0-9\.]+) timesteps/s",
         group_name="tsps",
         units="timesteps/s",
         fom_type=FomType.THROUGHPUT,

var/ramble/repos/builtin/applications/lulesh/application.py

@@ -68,15 +68,15 @@ class Lulesh(ExecutableApplication):
     figure_of_merit(
         "Time",
         log_file=log_str,
-        fom_regex=r"\s*Elapsed time\s+=\s+(?P<time>[0-9]+\.[0-9]+).*",
+        fom_regex=r"\s*Elapsed time\s+=\s+(?P<time>[0-9]+\.[0-9]+)",
         group_name="time",
         units="s",
     )
 
     figure_of_merit(
         "FOM",
         log_file=log_str,
-        fom_regex=r"\s*FOM\s+=\s+(?P<fom>[0-9]+\.[0-9]+).*",
+        fom_regex=r"\s*FOM\s+=\s+(?P<fom>[0-9]+\.[0-9]+)",
         group_name="fom",
         units="z/s",
     )
@@ -92,7 +92,7 @@ class Lulesh(ExecutableApplication):
     figure_of_merit(
         "Grind Time",
         log_file=log_str,
-        fom_regex=r"\s*Grind time \(us/z/c\)\s+=\s+(?P<grind>[0-9]+\.[0-9]+).*",
+        fom_regex=r"\s*Grind time \(us/z/c\)\s+=\s+(?P<grind>[0-9]+\.[0-9]+)",
         group_name="grind",
         units="s/element",
     )

var/ramble/repos/builtin/applications/minixyce/application.py

@@ -153,7 +153,7 @@ class Minixyce(ExecutableApplication):
     floating_point_regex = r"\d+\.\d+"
     scientific_number_regex = r"[\+\-]*\d+\.\d+[eE][\+\-]*\d+"
 
-    success_regex = r"^\s*TIME.*num_GMRES_iters\s*num_GMRES_restarts"
+    success_regex = r"^\s*TIME.*?num_GMRES_iters\s*num_GMRES_restarts"
     success_criteria("valid", mode="string", match=success_regex, file=log_str)
 
     figure_of_merit(