holobench 1.30.2__tar.gz → 1.30.3__tar.gz

{holobench-1.30.2 → holobench-1.30.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: holobench
-Version: 1.30.2
+Version: 1.30.3
 Summary: A package for benchmarking the performance of arbitrary functions
 Project-URL: Repository, https://github.com/dyson-ai/bencher
 Project-URL: Home, https://github.com/dyson-ai/bencher
@@ -13,12 +13,12 @@ Requires-Dist: holoviews<=1.19.1,>=1.15
 Requires-Dist: hvplot<=0.10.0,>=0.8
 Requires-Dist: matplotlib<=3.9.2,>=3.6.3
 Requires-Dist: moviepy-fix-codec
-Requires-Dist: numpy<=2.1.0,>=1.0
+Requires-Dist: numpy<=2.1.3,>=1.0
 Requires-Dist: optuna<=4.0.0,>=3.2
 Requires-Dist: pandas<=2.2.2,>=2.0
 Requires-Dist: panel<=1.4.5,>=1.3.6
 Requires-Dist: param<=2.1.1,>=1.13.0
-Requires-Dist: plotly<=5.24.0,>=5.15
+Requires-Dist: plotly<=5.24.1,>=5.15
 Requires-Dist: scikit-learn<=1.5.1,>=1.2
 Requires-Dist: scoop<=0.7.2.0,>=0.7.0
 Requires-Dist: sortedcontainers<=2.4,>=2.4

{holobench-1.30.2 → holobench-1.30.3}/bencher/example/example_float3D.py

@@ -1,11 +1,9 @@
 # pylint: disable=duplicate-code
-
 import numpy as np
-
 import bencher as bch
 
 
-class VolumeSample(bch.ParametrizedSweep):
+class VolumeSweep(bch.ParametrizedSweep):
     """A class to represent a 3D point in space."""
 
     x = bch.FloatSweep(
@@ -18,10 +16,6 @@ class VolumeSample(bch.ParametrizedSweep):
         default=0, bounds=[-1.0, 1.0], doc="z coordinate of the sample volume", samples=6
     )
 
-
-class VolumeResult(bch.ParametrizedSweep):
-    """A class to represent the properties of a volume sample."""
-
     value = bch.ResultVar("ul", doc="The scalar value of the 3D volume field")
     occupancy = bch.ResultVar(
         "occupied", doc="If the value is > 0.5 this point is considered occupied"
@@ -32,33 +26,25 @@ class VolumeResult(bch.ParametrizedSweep):
         3, "vec", doc="The same vector field but only showing values in a sphere of radius 0.5"
     )
 
+    def __call__(self, **kwargs) -> dict:
+        """This function takes a 3D point as input and returns distance of that point to the origin."""
+        self.update_params_from_kwargs(**kwargs)
+        self.value = np.linalg.norm(np.array([self.x, self.y, self.z]))  # distance to origin
+        self.occupancy = float(self.value < 0.5)
+        # from https://plotly.com/python/3d-volume-plots/
+        self.interesting = np.sin(np.pi * self.x) * np.cos(np.pi * self.z) * np.sin(np.pi * self.y)
+        self.interesting_vec = [
+            np.sin(np.pi * self.x),
+            np.cos(np.pi * self.z),
+            np.sin(np.pi * self.y),
+        ]
 
-def bench_fn(point: VolumeSample) -> VolumeResult:
-    """This function takes a 3D point as input and returns distance of that point to the origin.
+        if self.occupancy:
+            self.interesting_vec_and_occ = self.interesting_vec
+        else:
+            self.interesting_vec_and_occ = [0, 0, 0]
 
-    Args:
-        point (VolumeSample): Sample point
-
-    Returns:
-        VolumeResult: Value at that point
-    """
-    output = VolumeResult()
-    output.value = np.linalg.norm(np.array([point.x, point.y, point.z]))  # distance to origin
-    output.occupancy = float(output.value < 0.5)
-    # from https://plotly.com/python/3d-volume-plots/
-    output.interesting = np.sin(np.pi * point.x) * np.cos(np.pi * point.z) * np.sin(np.pi * point.y)
-    output.interesting_vec = [
-        np.sin(np.pi * point.x),
-        np.cos(np.pi * point.z),
-        np.sin(np.pi * point.y),
-    ]
-
-    if output.occupancy:
-        output.interesting_vec_and_occ = output.interesting_vec
-    else:
-        output.interesting_vec_and_occ = [0, 0, 0]
-
-    return output
+        return super().__call__()
 
 
 def example_floats3D(
@@ -72,21 +58,15 @@ def example_floats3D(
     Returns:
         Bench: results of the parameter sweep
     """
-    bench = bch.Bench(
-        "Bencher_Example_Floats",
-        bench_fn,
-        VolumeSample,
-        run_cfg=run_cfg,
-        report=report,
-    )
+    bench = VolumeSweep().to_bench(run_cfg=run_cfg, report=report)
 
     bench.plot_sweep(
         title="Float 3D Example",
-        input_vars=[VolumeSample.param.x, VolumeSample.param.y, VolumeSample.param.z],
+        input_vars=["x", "y", "z"],
         result_vars=[
-            VolumeResult.param.value,
-            VolumeResult.param.occupancy,
-            VolumeResult.param.interesting,
+            "value",
+            "occupancy",
+            "interesting",
         ],
         description="""This example shows how to sample 3 floating point variables and plot a volumetric representation of the results.  The benchmark function returns the distance to the origin""",
         post_description="Here you can see concentric shells as the value of the function increases with distance from the origin. The occupancy graph should show a sphere with radius=0.5",
@@ -97,5 +77,5 @@ def example_floats3D(
 
 if __name__ == "__main__":
     ex_run_cfg = bch.BenchRunCfg()
-    ex_run_cfg.level = 3
+    ex_run_cfg.level = 6
     example_floats3D(ex_run_cfg).report.show()

{holobench-1.30.2 → holobench-1.30.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.30.2"
+version = "1.30.3"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -11,7 +11,7 @@ requires-python = ">=3.10,<3.13"
 
 dependencies = [
   "holoviews>=1.15,<=1.19.1",
-  "numpy>=1.0,<=2.1.0",
+  "numpy>=1.0,<=2.1.3",
   "param>=1.13.0,<=2.1.1",
   "hvplot>=0.8,<=0.10.0",
   "matplotlib>=3.6.3,<=3.9.2",
@@ -19,7 +19,7 @@ dependencies = [
   "diskcache>=5.6,<=5.6.3",
   "optuna>=3.2,<=4.0.0",
   "xarray>=2023.7,<=2024.7.0",
-  "plotly>=5.15,<=5.24.0",
+  "plotly>=5.15,<=5.24.1",
   "sortedcontainers>=2.4,<=2.4",
   "pandas>=2.0,<=2.2.2",
   "strenum>=0.4.0,<=0.4.15",
@@ -92,7 +92,7 @@ coverage-report = "coverage report -m"
 update-lock = "pixi update && git commit -a -m'update pixi.lock' || true"
 push = "git push"
 update-lock-push = { depends_on = ["update-lock", "push"] }
-fix = { depends_on = ["update-lock", "format", "ruff-lint"] }
+fix = { depends_on = ["update-lock","pre-commit", "format", "ruff-lint"] }
 fix-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] }
 ci-no-cover = { depends_on = ["style", "test"] }
 ci = { depends_on = ["format","ruff-lint", "pylint", "coverage", "coverage-report"] }