holobench 1.11.0__tar.gz → 1.12.0__tar.gz

{holobench-1.11.0 → holobench-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.11.0
+Version: 1.12.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Description-Content-Type: text/markdown
@@ -8,26 +8,26 @@ Requires-Dist: holoviews>=1.15,<=1.18.3
 Requires-Dist: numpy>=1.0,<=1.26.4
 Requires-Dist: param>=1.13.0,<=2.1.0
 Requires-Dist: hvplot>=0.8,<=0.9.2
-Requires-Dist: matplotlib>=3.6.3,<=3.8.3
-Requires-Dist: panel>=1.3.6,<=1.4.0
+Requires-Dist: matplotlib>=3.6.3,<=3.8.4
+Requires-Dist: panel>=1.3.6,<=1.4.2
 Requires-Dist: diskcache>=5.6,<=5.6.3
 Requires-Dist: optuna>=3.2,<=3.6.1
 Requires-Dist: xarray>=2023.7,<=2024.3.0
-Requires-Dist: plotly>=5.15,<=5.20.0
+Requires-Dist: plotly>=5.15,<=5.21.0
 Requires-Dist: sortedcontainers>=2.4,<=2.4
-Requires-Dist: pandas>=2.0,<=2.2.1
+Requires-Dist: pandas>=2.0,<=2.2.2
 Requires-Dist: strenum>=0.4.0,<=0.4.15
-Requires-Dist: scikit-learn>=1.2,<=1.4.1.post1
+Requires-Dist: scikit-learn>=1.2,<=1.4.2
 Requires-Dist: str2bool>=1.1,<=1.1
 Requires-Dist: scoop>=0.7.0,<=0.7.2.0
 Requires-Dist: moviepy>=1.0.3,<=1.0.3
-Requires-Dist: black>=23,<=24.1.1 ; extra == "test"
-Requires-Dist: pylint>=2.16,<=3.0.3 ; extra == "test"
-Requires-Dist: pytest-cov>=4.1,<=4.1 ; extra == "test"
-Requires-Dist: pytest>=7.4,<=8.0.0 ; extra == "test"
-Requires-Dist: hypothesis>=6.82,<=6.97.1 ; extra == "test"
-Requires-Dist: ruff>=0.0.280,<=0.1.14 ; extra == "test"
-Requires-Dist: coverage>=7.2.7,<=7.4.1 ; extra == "test"
+Requires-Dist: black>=23,<=24.4.2 ; extra == "test"
+Requires-Dist: pylint>=2.16,<=3.1.0 ; extra == "test"
+Requires-Dist: pytest-cov>=4.1,<=5.0.0 ; extra == "test"
+Requires-Dist: pytest>=7.4,<=8.2.0 ; extra == "test"
+Requires-Dist: hypothesis>=6.82,<=6.100.2 ; extra == "test"
+Requires-Dist: ruff>=0.0.280,<=0.4.2 ; extra == "test"
+Requires-Dist: coverage>=7.2.7,<=7.5.0 ; extra == "test"
 Project-URL: Documentation, https://bencher.readthedocs.io/en/latest/
 Project-URL: Home, https://github.com/dyson-ai/bencher
 Project-URL: Repository, https://github.com/dyson-ai/bencher

{holobench-1.11.0 → holobench-1.12.0}/bencher/bencher.py

@@ -217,7 +217,7 @@ class Bench(BenchPlotServer):
         group_size: int = 1,
         iterations: int = 1,
         relationship_cb=None,
-        plot=None,
+        plot_callbacks: List | bool = None,
     ) -> List[BenchResult]:
         results = []
         if relationship_cb is None:
@@ -233,7 +233,7 @@ class Bench(BenchPlotServer):
                     result_vars=result_vars,
                     const_vars=const_vars,
                     run_cfg=run_cfg,
-                    plot=plot,
+                    plot_callbacks=plot_callbacks,
                 )
 
                 if optimise_var is not None:
@@ -253,8 +253,7 @@ class Bench(BenchPlotServer):
         pass_repeat: bool = False,
         tag: str = "",
         run_cfg: BenchRunCfg = None,
-        plot: bool = None,
-        plot_callbacks=None,
+        plot_callbacks: List | bool = None,
     ) -> BenchResult:
         """The all in 1 function benchmarker and results plotter.
 
@@ -270,7 +269,7 @@ class Bench(BenchPlotServer):
             you want the benchmark function to be passed the repeat number
             tag (str,optional): Use tags to group different benchmarks together.
             run_cfg: (BenchRunCfg, optional): A config for storing how the benchmarks and run
-            plot_callbacks: A list of plot callbacks to clal on the results
+            plot_callbacks: (List | bool) A list of plot callbacks to call on the results. Pass false or an empty list to turn off plotting
         Raises:
             ValueError: If a result variable is not set
 
@@ -329,8 +328,6 @@ class Bench(BenchPlotServer):
             cv_list = list(const_vars[i])
             cv_list[0] = self.convert_vars_to_params(cv_list[0], "const")
             const_vars[i] = cv_list
-        if plot is None:
-            plot = self.plot
 
         if run_cfg is None:
             if self.run_cfg is None:
@@ -387,10 +384,12 @@ class Bench(BenchPlotServer):
             )
 
         if plot_callbacks is None:
-            if self.plot_callbacks is not None and len(self.plot_callbacks) == 0:
+            plot_callbacks = [] if self.plot_callbacks is None else self.plot_callbacks
+        else:
+            if isinstance(plot_callbacks, bool):
+                plot_callbacks = [BenchResult.to_auto_plots] if plot_callbacks else []
+            elif len(self.plot_callbacks) == 0:
                 plot_callbacks = [BenchResult.to_auto_plots]
-            else:
-                plot_callbacks = self.plot_callbacks
 
         bench_cfg = BenchCfg(
             input_vars=input_vars,
@@ -403,7 +402,6 @@ class Bench(BenchPlotServer):
             title=title,
             pass_repeat=pass_repeat,
             tag=run_cfg.run_tag + tag,
-            auto_plot=plot,
             plot_callbacks=plot_callbacks,
         )
         return self.run_sweep(bench_cfg, run_cfg, time_src)

{holobench-1.11.0 → holobench-1.12.0}/bencher/example/example_float_cat.py

@@ -46,7 +46,7 @@ def example_float_cat(
         title="Float 1D Cat 1D  Example",
         description="""Following from the previous example lets add another input parameter to see how that affects the output.  We pass the boolean  'noisy' and keep the other parameters the same""",
         post_description="Now the plot has two lines, one for each of the boolean values where noisy=true and noisy=false.",
-        plot=False,
+        plot_callbacks=False,
     )
 
     # report.append(bench.get_result().to_curve())

{holobench-1.11.0 → holobench-1.12.0}/bencher/example/meta/example_meta.py

@@ -128,7 +128,7 @@ class BenchMeta(bch.ParametrizedSweep):
             # result_vars=[BenchableObject.param.distance, BenchableObject.param.sample_noise],
             # result_vars=[ BenchableObject.param.sample_noise],
             # result_vars=[BenchableObject.param.result_hmap],
-            plot=False,
+            plot_callbacks=False,
         )
 
         self.plots = bch.ResultReference()

{holobench-1.11.0 → holobench-1.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.11.0"
+version = "1.12.0"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -15,16 +15,16 @@ dependencies = [
   "numpy>=1.0,<=1.26.4",
   "param>=1.13.0,<=2.1.0",
   "hvplot>=0.8,<=0.9.2",
-  "matplotlib>=3.6.3,<=3.8.3",
-  "panel>=1.3.6,<=1.4.0",
+  "matplotlib>=3.6.3,<=3.8.4",
+  "panel>=1.3.6,<=1.4.2",
   "diskcache>=5.6,<=5.6.3",
   "optuna>=3.2,<=3.6.1",
   "xarray>=2023.7,<=2024.3.0",
-  "plotly>=5.15,<=5.20.0",
+  "plotly>=5.15,<=5.21.0",
   "sortedcontainers>=2.4,<=2.4",
-  "pandas>=2.0,<=2.2.1",
+  "pandas>=2.0,<=2.2.2",
   "strenum>=0.4.0,<=0.4.15",
-  "scikit-learn>=1.2,<=1.4.1.post1",
+  "scikit-learn>=1.2,<=1.4.2",
   "str2bool>=1.1,<=1.1",
   "scoop>=0.7.0,<=0.7.2.0",
   "moviepy>=1.0.3,<=1.0.3",
@@ -32,13 +32,13 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
-  "black>=23,<=24.1.1",
-  "pylint>=2.16,<=3.0.3",
-  "pytest-cov>=4.1,<=4.1",
-  "pytest>=7.4,<=8.0.0",
-  "hypothesis>=6.82,<=6.97.1",
-  "ruff>=0.0.280,<=0.1.14",
-  "coverage>=7.2.7,<=7.4.1",
+  "black>=23,<=24.4.2",
+  "pylint>=2.16,<=3.1.0",
+  "pytest-cov>=4.1,<=5.0.0",
+  "pytest>=7.4,<=8.2.0",
+  "hypothesis>=6.82,<=6.100.2",
+  "ruff>=0.0.280,<=0.4.2",
+  "coverage>=7.2.7,<=7.5.0",
 ]
 
 [project.urls]