Merge branch 'topic/default/profile' into 'branch/default'

paugier · paugier · commit d07b26a3b8d0 · 2025-12-02T15:35:29.000Z
Update profile related to fluidfft-builder 0.0.3

See merge request fluiddyn/fluidsim!445
diff --git a/fluidsim/base/preprocess/test.py b/fluidsim/base/preprocess/test.py
@@ -33,7 +33,3 @@ def test_set_viscosity(self):
         self.assertEqual(sim.params.nu_4 + sim.params.nu_8, 0)
         assert np.any(sim.time_stepping.freq_lin > 0)
         sim.output.close_files()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/base/test/test_base_solver.py b/fluidsim/base/test/test_base_solver.py
@@ -20,7 +20,3 @@ def test_simul(self):
         self.sim.time_stepping.start()
 
         fld.show()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/base/test/test_base_solver_ps.py b/fluidsim/base/test/test_base_solver_ps.py
@@ -93,7 +93,3 @@ def test_simul(self):
             var = self.sim.state.get_var(key)
             var_big = sim_big.state.get_var(key)
             assert np.mean(var**2) == np.mean(var_big**2)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/base/test/test_params.py b/fluidsim/base/test/test_params.py
@@ -19,7 +19,3 @@ def test_merge(self):
         params1 = SimulBase.create_default_params()
         params2 = Simul.create_default_params()
         merge_params(params1, params2)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ad1d/test_solver.py b/fluidsim/solvers/ad1d/test_solver.py
@@ -105,7 +105,3 @@ def init_params(cls):
     )
     def test_init(self):
         """Only test the initialization"""
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/models0d/test_lorenz.py b/fluidsim/solvers/models0d/test_lorenz.py
@@ -37,7 +37,3 @@ def test_lorenz(self, params=None):
         sim.output.print_stdout.plot_XZ()
         sim.output.print_stdout.plot_XY()
         sim.output.print_stdout.plot_XY_vs_time()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/models0d/test_predaprey.py b/fluidsim/solvers/models0d/test_predaprey.py
@@ -32,7 +32,3 @@ def test_predaprey(self, params=None):
         sim.output.print_stdout.plot_XY_vs_time()
         sim.output.print_stdout.plot_deltat()
         sim.output.print_stdout.plot_potential()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ns2d/bouss/test_solver.py b/fluidsim/solvers/ns2d/bouss/test_solver.py
@@ -114,7 +114,3 @@ def test_forcing_output(self):
             sim3.time_stepping.start()
 
         plt.close("all")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ns2d/test_solver.py b/fluidsim/solvers/ns2d/test_solver.py
@@ -340,7 +340,3 @@ def init_params(self):
 
     def test_init_dipole(self):
         pass
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ns3d/bouss/test_solver.py b/fluidsim/solvers/ns3d/bouss/test_solver.py
@@ -96,7 +96,3 @@ def test_init_in_script(self):
 
         sim.state.init_from_vxvyfft(vx_fft, vy_fft)
         sim.state.init_from_vxvyvzfft(vx_fft, vy_fft, vz_fft)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ns3d/strat/test_solver.py b/fluidsim/solvers/ns3d/strat/test_solver.py
@@ -305,7 +305,3 @@ def test_noshearmodes(self):
         assert np.allclose(PK_tot, 1.0)
 
         sim.state.check_energy_equal_phys_spect()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/ns3d/test_solver.py b/fluidsim/solvers/ns3d/test_solver.py
@@ -667,7 +667,3 @@ def init_params(cls):
     def test_milestone(self):
         super().test_milestone()
         self.sim.forcing.get_info()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/plate2d/test_solver.py b/fluidsim/solvers/plate2d/test_solver.py
@@ -136,7 +136,3 @@ def test_output(self):
 
         sim.output.spectra.plot1d()
         sim.output.spectra.plot2d()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/exactlin/modified/test_solver.py b/fluidsim/solvers/sw1l/exactlin/modified/test_solver.py
@@ -85,7 +85,3 @@ def test_energy_conservation_fft(self):
         T_tot = T_ux + T_uy + T_eta
         sum_T = oper.sum_wavenumbers(T_tot)
         self.assertAlmostZero(sum_T)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/exactlin/test_solver.py b/fluidsim/solvers/sw1l/exactlin/test_solver.py
@@ -82,7 +82,3 @@ def test_energy_conservation(self):
         A_fft = oper.fft2(A)
         if mpi.rank == 0:
             self.assertAlmostZero(A_fft[0, 0], tolerance_warning=False)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/modified/test_solver.py b/fluidsim/solvers/sw1l/modified/test_solver.py
@@ -128,7 +128,3 @@ def test_state_compute(self):
             "a_fft",
         ):
             var_computed = self.sim.state.compute(key)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/onlywaves/test_solver.py b/fluidsim/solvers/sw1l/onlywaves/test_solver.py
@@ -80,7 +80,3 @@ def test_init_methods(self):
     def test_state_compute(self):
         for key in ("uy_fft", "rot", "q"):
             var_computed = self.sim.state.compute(key)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/test_operators.py b/fluidsim/solvers/sw1l/test_operators.py
@@ -70,7 +70,3 @@ def test_uxuyeta_qapam_conversion(self):
         np.testing.assert_allclose(q2_fft, q_fft, self.rtol, self.atol)
         np.testing.assert_allclose(ap2_fft, ap_fft, self.rtol, self.atol)
         np.testing.assert_allclose(am2_fft, am_fft, self.rtol, self.atol)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/solvers/sw1l/test_solver.py b/fluidsim/solvers/sw1l/test_solver.py
@@ -200,7 +200,3 @@ def test_state_init_from_uxuyfft(self):
     def test_state_compute(self):
         for key in ("q", "h", "Floc"):
             var_computed = self.sim.state.compute(key)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/fluidsim/util/console/profile.py b/fluidsim/util/console/profile.py
@@ -7,6 +7,7 @@
 import os
 from time import time
 from pathlib import Path
+from warnings import warn
 
 import pstats
 import cProfile
@@ -154,18 +155,15 @@ def _profile(type_fft):
 
         try:
             run_profile(sim, nb_dim, path_dir, verbose=verbose)
-        except Exception as e:
+        except Exception:
             if _is_testing:
                 raise
 
             else:
-                print(
-                    "WARNING: Some error occurred while running benchmark"
-                    " / saving results!"
+                warn(
+                    "Some error occurred while running benchmark / saving results!"
                 )
                 raise
-
-                print(e)
         finally:
             tear_down(sim)
             gc.collect()
@@ -359,50 +357,53 @@ def analyze_stats(
     times = {k: 0.0 for k in kinds}
 
     for key, value in stats.stats.items():
+        path_src = key[0]
         name = key[2]
         time = value[2]
+        category_chosen = None
+
+        for category in kinds:
+            if category in name or category in path_src:
+                if category == ".py" and (
+                    not path_src.endswith(category)
+                    or os.path.sep + "numpy" in path_src
+                    or "fft_as_arg" in name
+                ):
+                    continue
 
-        for k in kinds:
-            if k in name or k in key[0]:
-                if k == ".pyx":
-                    if "fft/Sources" in key[0]:
-                        continue
-
-                    if "fft_as_arg" in name:
+                if category == ".pyx":
+                    if "fft/Sources" in path_src or "fft_as_arg" in name:
                         continue
 
-                if k == key_fft:
+                if category == key_fft:
                     if (
                         "__pythran__" in name
-                        or "operators.py" in key[0]
+                        or "operators.py" in path_src
                         or "fft_as_arg" in name
+                        or "fft" not in name
                     ):
                         continue
 
-                    callers = value[4]
-
-                    time = 0
-                    for kcaller, vcaller in callers.items():
-                        if (
-                            "fft_as_arg" not in kcaller[2]
-                            and "fft_as_arg" not in kcaller[0]
-                        ):
-                            time += vcaller[2]
-
-                if k == "fft_as" and ".pyx" in key[0]:
+                if category == "built-in" and (
+                    "pythran" in name or "numpy" in name
+                ):
                     continue
 
-                if k == ".py" and "fft_as_arg" in name:
-                    continue
-
-                if k == "built-in" and "pythran" in name:
-                    continue
-
-                times[k] += time
-
                 if time / total_time > threshold_long_function:
                     long_functions[name] = dict(
-                        time=time, percentage=100 * time / total_time, kind=k
+                        time=time,
+                        percentage=100 * time / total_time,
+                        kind=category,
+                    )
+                times[category] += time
+
+                if category_chosen is None:
+                    category_chosen = category
+                else:
+                    warn(
+                        f"problem in analysis: function {name} has "
+                        f"previously been chosen as '{category_chosen}'"
+                        f"and is now chosen as '{category}'.\n{key = }\n{value = }"
                     )
 
     if plot:
@@ -428,10 +429,12 @@ def analyze_stats(
     keys = list(times.keys())
     keys.sort(key=lambda key: times[key], reverse=True)
 
-    for k in keys:
-        t = times[k]
+    for category in keys:
+        t = times[category]
         if t > 0:
-            print(f"time {k:10s}: {t / total_time * 100:7.03f} % ({t:4.02f} s)")
+            print(
+                f"time {category:10s}: {t / total_time * 100:7.03f} % ({t:4.02f} s)"
+            )
 
     print(
         "-" * 26
diff --git a/fluidsim/util/console/test_profile.py b/fluidsim/util/console/test_profile.py
@@ -65,7 +65,3 @@ def test1d(self):
         #  with self.assertRaises(ConsoleError):
         #      # No profiling implemented for 1D solvers
         #      run_profile()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/pylock.toml b/pylock.toml

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,3 @@ def init_params(cls):`
`105`	`105`	`)`
`106`	`106`	`def test_init(self):`
`107`	`107`	`"""Only test the initialization"""`
`108`		`-`
`109`		`-`
`110`		`-if __name__ == "__main__":`
`111`		`- unittest.main()`