++

PhilipDeegan · PhilipDeegan · commit fa64e08ae168 · 2025-04-23T16:46:24.000+02:00
diff --git a/tests/functional/harris/harris_2d.py b/tests/functional/harris/harris_2d.py
@@ -7,12 +7,13 @@
 from pyphare.simulator.simulator import Simulator
 from pyphare.simulator.simulator import startMPI
 
+from tests.simulator import SimulatorTest
+
 
 ph.NO_GUI()
 cpp = cpp_lib()
 
 
-
 diag_outputs = "phare_outputs/test/harris/2d"
 time_step_nbr = 1000
 time_step = 0.001
@@ -23,6 +24,7 @@ def default_timestamps():
     dt = 10 * time_step
     nt = final_time / dt + 1
     timestamps = dt * np.arange(nt)
+    return timestamps
 
 
 def default_setup():
@@ -48,7 +50,7 @@ def default_setup():
     )
 
 
-def config(sim = None, timestamps = None, seed = 12334):
+def config(sim=None, timestamps=None, seed=12334):
     if sim is None:
         sim = default_setup()
     if timestamps is None:
@@ -154,10 +156,70 @@ def vthz(x, y):
     return sim
 
 
-def main():
-    Simulator(config()).run()
-
+def plot_file_for_qty(plot_dir, qty, time):
+    return f"{plot_dir}/harris_{qty}_t{time}.png"
+
+
+class HarrisTest(SimulatorTest):
+    def __init__(self, *args, **kwargs):
+        super(HarrisTest, self).__init__(*args, **kwargs)
+        self.simulator = None
+
+    def tearDown(self):
+        super(HarrisTest, self).tearDown()
+        if self.simulator is not None:
+            self.simulator.reset()
+        self.simulator = None
+        ph.global_vars.sim = None
+
+    def test_run(self, diag_dir=None, sim=None):
+        diag_dir = diag_dir if diag_dir else diag_outputs
+        sim = sim if sim else config()
+        self.register_diag_dir_for_cleanup(diag_dir)
+        Simulator(sim).run().reset()
+        return self
+
+    def plot(self, timestamps, diag_dir, plot_dir):
+        run = self.run(diag_dir)
+        for time in timestamps:
+            run.GetDivB(time).plot(
+                filename=plot_file_for_qty(plot_dir, "divb", time),
+                plot_patches=True,
+                vmin=1e-11,
+                vmax=2e-10,
+            )
+            run.GetRanks(time).plot(
+                filename=plot_file_for_qty(plot_dir, "Ranks", time),
+                plot_patches=True,
+            )
+            run.GetN(time, pop_name="protons").plot(
+                filename=plot_file_for_qty(plot_dir, "N", time),
+                plot_patches=True,
+            )
+            for c in ["x", "y", "z"]:
+                run.GetB(time).plot(
+                    filename=plot_file_for_qty(plot_dir, f"b{c}", time),
+                    qty=f"{c}",
+                    plot_patches=True,
+                )
+            run.GetJ(time).plot(
+                filename=plot_file_for_qty(plot_dir, "jz", time),
+                qty="z",
+                plot_patches=True,
+                vmin=-2,
+                vmax=2,
+            )
+
+    def scope_timing(self, diag_dir):
+        try:
+            from tools.python3 import plotting as m_plotting
+
+            m_plotting.plot_run_timer_data(diag_dir, cpp.mpi_rank())
+        except ImportError:
+            print("Phlop not found - install with: `pip install phlop`")
+        except FileNotFoundError:
+            print("Phlop installed but not active")
 
 
 if __name__ == "__main__":
-    main()
+    HarrisTest().test_run().tearDown()
diff --git a/tests/functional/harris/harris_2d_100_x_100.py b/tests/functional/harris/harris_2d_100_x_100.py
@@ -7,10 +7,7 @@
 
 import pyphare.pharein as ph
 from pyphare.cpp import cpp_lib
-from pyphare.pharesee.run import Run
-from pyphare.simulator.simulator import Simulator, startMPI
-
-from tests.simulator import SimulatorTest
+from pyphare.simulator.simulator import startMPI
 
 import harris_2d as base
 
@@ -49,8 +46,6 @@ def config():
         final_time=final_time,
         cells=cells,
         dl=(0.40, 0.40),
-        # refinement="tagging",
-        # max_nbr_levels=1,
         nesting_buffer=1,
         clustering="tile",
         tag_buffer="1",
@@ -77,69 +72,17 @@ def config():
     return sim
 
 
-def plot_file_for_qty(qty, time):
-    return f"{plot_dir}/harris_{qty}_t{time}.png"
-
-
-def plot(diag_dir):
-    run = Run(diag_dir)
-    for time in timestamps:
-        run.GetDivB(time).plot(
-            filename=plot_file_for_qty("divb", time),
-            plot_patches=True,
-            vmin=1e-11,
-            vmax=2e-10,
-        )
-        run.GetRanks(time).plot(
-            filename=plot_file_for_qty("Ranks", time),
-            plot_patches=True,
-        )
-        run.GetN(time, pop_name="protons").plot(
-            filename=plot_file_for_qty("N", time),
-            plot_patches=True,
-        )
-        for c in ["x", "y", "z"]:
-            run.GetB(time).plot(
-                filename=plot_file_for_qty(f"b{c}", time),
-                qty=f"{c}",
-                plot_patches=True,
-            )
-        run.GetJ(time).plot(
-            filename=plot_file_for_qty("jz", time),
-            qty="z",
-            plot_patches=True,
-            vmin=-2,
-            vmax=2,
-        )
-
-
-class HarrisTest(SimulatorTest):
+class HarrisTest(base.HarrisTest):
     def __init__(self, *args, **kwargs):
         super(HarrisTest, self).__init__(*args, **kwargs)
-        self.simulator = None
-
-    def tearDown(self):
-        super(HarrisTest, self).tearDown()
-        if self.simulator is not None:
-            self.simulator.reset()
-        self.simulator = None
-        ph.global_vars.sim = None
 
     def test_run(self):
-        self.register_diag_dir_for_cleanup(diag_dir)
-        Simulator(config()).run().reset()
+        super(HarrisTest, self).test_run(diag_dir, config())
         if cpp.mpi_rank() == 0:
-            plot(diag_dir)
+            self.plot(timestamps, diag_dir, plot_dir)
 
         if SCOPE_TIMING:
-            try:
-                from tools.python3 import plotting as m_plotting
-
-                m_plotting.plot_run_timer_data(diag_dir, cpp.mpi_rank())
-            except ImportError:
-                print("Phlop not found - install with: `pip install phlop`")
-
-        cpp.mpi_barrier()
+            self.scope_timing(diag_dir)
         return self
 
 
diff --git a/tests/functional/harris/harris_2d_100_x_100_slow.py b/tests/functional/harris/harris_2d_100_x_100_slow.py
@@ -6,11 +6,9 @@
 from pathlib import Path
 
 import pyphare.pharein as ph
-from pyphare.cpp import cpp_lib
-from pyphare.pharesee.run import Run
-from pyphare.simulator.simulator import Simulator, startMPI
 
-from tests.simulator import SimulatorTest
+from pyphare.cpp import cpp_lib
+from pyphare.simulator.simulator import startMPI
 
 import harris_2d as base
 
@@ -77,69 +75,17 @@ def config():
     return sim
 
 
-def plot_file_for_qty(qty, time):
-    return f"{plot_dir}/harris_{qty}_t{time}.png"
-
-
-def plot(diag_dir):
-    run = Run(diag_dir)
-    for time in timestamps:
-        run.GetDivB(time).plot(
-            filename=plot_file_for_qty("divb", time),
-            plot_patches=True,
-            vmin=1e-11,
-            vmax=2e-10,
-        )
-        run.GetRanks(time).plot(
-            filename=plot_file_for_qty("Ranks", time),
-            plot_patches=True,
-        )
-        run.GetN(time, pop_name="protons").plot(
-            filename=plot_file_for_qty("N", time),
-            plot_patches=True,
-        )
-        for c in ["x", "y", "z"]:
-            run.GetB(time).plot(
-                filename=plot_file_for_qty(f"b{c}", time),
-                qty=f"{c}",
-                plot_patches=True,
-            )
-        run.GetJ(time).plot(
-            filename=plot_file_for_qty("jz", time),
-            qty="z",
-            plot_patches=True,
-            vmin=-2,
-            vmax=2,
-        )
-
-
-class HarrisTest(SimulatorTest):
+class HarrisTest(base.HarrisTest):
     def __init__(self, *args, **kwargs):
         super(HarrisTest, self).__init__(*args, **kwargs)
-        self.simulator = None
-
-    def tearDown(self):
-        super(HarrisTest, self).tearDown()
-        if self.simulator is not None:
-            self.simulator.reset()
-        self.simulator = None
-        ph.global_vars.sim = None
 
     def test_run(self):
-        self.register_diag_dir_for_cleanup(diag_dir)
-        Simulator(config()).run().reset()
+        super(HarrisTest, self).test_run(diag_dir, config())
         if cpp.mpi_rank() == 0:
-            plot(diag_dir)
+            self.plot(timestamps, diag_dir, plot_dir)
 
         if SCOPE_TIMING:
-            try:
-                from tools.python3 import plotting as m_plotting
-
-                m_plotting.plot_run_timer_data(diag_dir, cpp.mpi_rank())
-            except ImportError:
-                print("Phlop not found - install with: `pip install phlop`")
-
-        cpp.mpi_barrier()
+            self.scope_timing(diag_dir)
         return self
 
 
diff --git a/tests/simulator/__init__.py b/tests/simulator/__init__.py
@@ -1,8 +1,12 @@
 import os
 import unittest
+import numpy as np
+import pyphare.pharein as ph
+
+from functools import wraps
 from datetime import datetime
-import pyphare.pharein as ph, numpy as np
 from pyphare.pharein import ElectronModel
+from pyphare.pharesee import run
 
 
 def parse_cli_args(pop_from_sys=True):
@@ -192,53 +196,34 @@ def _diff(slice0):
     return boxes
 
 
-#
-#
-
-
-def caliper_func_times_json(data_dir, mpi_rank=0):
-    return f"{os.path.join(data_dir, f'func_times.{mpi_rank}.json')}"
-
-
-def caliper_recorder_cali(data_dir, mpi_rank=0):
-    return f"{os.path.join(data_dir, f'recorder.{mpi_rank}.cali')}"
-
-
-CALIPER_MODES = [
-    # "callpath:event:recorder:trace",
-    "report,event,trace,timestamp,recorder",  # light
-    "alloc,aggregate,cpuinfo,memusage,debug,env,event,loop_monitor,region_monitor,textlog,io,pthread,sysalloc,recorder,report,timestamp,statistics,spot,trace,validator,mpi,mpireport,mpiflush",  # heavy
-]
+class SimulatorTestRunInterop(run.Run):
+    """
+    Intercept calls to Run and catch FileNotFound errors for when
+     diags are not active/etc
+    """
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.dummies = {}
 
-def activate_caliper(data_dir, mode_idx=0):
-    from pyphare.cpp import cpp_lib
-
-    rank = cpp_lib().mpi_rank()
-    env = os.environ
-
-    # env["CALI_SERVICES_ENABLE"] = "event,trace,timer,report"
-    # env["CALI_REPORT_CONFIG"] = "format json"
-    # env["CALI_REPORT_FILENAME"] = "trace.json"
-
-    # env[
-    #     "CALI_CONFIG"
-    # ] = "hatchet-region-profile,topdown-counters.all,output.format=json"
-
-    # # env["CALI_CONFIG_PROFILE"] = "callstack-trace"
-    # env["CALI_SERVICES_ENABLE"] = CALIPER_MODES[mode_idx]
-
-    # env["CALI_CONFIG"] = "hatchet-region-profile"
+    @staticmethod
+    def _wrapper(func, func_name):
+        @wraps(func)
+        def wrapped(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except FileNotFoundError:
+                print("File not found, maybe diagnostic is not active")
 
-    # # env["CALI_CALLPATH_USE_NAME"] = "true"
+        return wrapped
 
-    # env["CALI_REPORT_FILENAME"] = caliper_func_times_json(data_dir, rank)
-    # env[
-    #     "CALI_REPORT_CONFIG"
-    # ] = "SELECT function,time.duration ORDER BY time.duration FORMAT json"
-    # env["CALI_RECORDER_FILENAME"] = caliper_recorder_cali(data_dir, rank)
+    def __getattribute__(self, name):
+        import types
 
-    # print("os.environ", os.environ)
+        attr = super(SimulatorTestRunInterop, self).__getattribute__(name)
+        if isinstance(attr, types.MethodType) and not name.startswith("_"):
+            attr = SimulatorTestRunInterop._wrapper(attr, name)
+        return attr
 
 
 class SimulatorTest(unittest.TestCase):
@@ -308,3 +293,6 @@ def clean_up_diags_dirs(self):
                 if os.path.exists(diag_dir):
                     shutil.rmtree(diag_dir)
         cpp_lib().mpi_barrier()
+
+    def run(self, diag_dir):
+        return SimulatorTestRunInterop(diag_dir)
