holobench 1.23.0__tar.gz → 1.24.0__tar.gz

{holobench-1.23.0/holobench.egg-info → holobench-1.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.23.0
+Version: 1.24.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Maintainer: austin.gregg-smith

{holobench-1.23.0 → holobench-1.24.0}/bencher/bencher.py

@@ -315,8 +315,21 @@ class Bench(BenchPlotServer):
             else:
                 const_vars = deepcopy(const_vars)
 
-        for i in range(len(input_vars)):
-            input_vars[i] = self.convert_vars_to_params(input_vars[i], "input")
+        if isinstance(input_vars, dict):
+            input_lists = []
+            for k, v in input_vars.items():
+                param_var = self.convert_vars_to_params(k, "input")
+                if isinstance(v, list):
+                    assert len(v) > 0
+                    param_var = param_var.with_sample_values(v)
+                else:
+                    raise RuntimeError("Unsupported type")
+                input_lists.append(param_var)
+
+            input_vars = input_lists
+        else:
+            for i in range(len(input_vars)):
+                input_vars[i] = self.convert_vars_to_params(input_vars[i], "input")
         for i in range(len(result_vars)):
             result_vars[i] = self.convert_vars_to_params(result_vars[i], "result")
 
@@ -484,6 +497,10 @@ class Bench(BenchPlotServer):
         """
         if isinstance(variable, str):
             variable = self.worker_class_instance.param.objects(instance=False)[variable]
+        if isinstance(variable, tuple):
+            variable = self.worker_class_instance.param.objects(instance=False)[
+                variable[0]
+            ].with_sample_values(variable[1])
         if not isinstance(variable, param.Parameter):
             raise TypeError(
                 f"You need to use {var_type}_vars =[{self.worker_input_cfg}.param.your_variable], instead of {var_type}_vars =[{self.worker_input_cfg}.your_variable]"

{holobench-1.23.0 → holobench-1.24.0/holobench.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.23.0
+Version: 1.24.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Maintainer: austin.gregg-smith

{holobench-1.23.0 → holobench-1.24.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.23.0"
+version = "1.24.0"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -80,8 +80,11 @@ test = "pytest"
 coverage = "coverage run -m pytest && coverage xml -o coverage.xml"
 coverage-report = "coverage report -m"
 update-lock = "pixi update && git commit -a -m'update pixi.lock'"
+fix = { depends_on = ["update-lock", "format", "ruff-lint"] }
 push = "git push"
 update-lock-push = { depends_on = ["update-lock", "push"] }
+fix-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] }
+
 ci-no-cover = { depends_on = ["style", "test"] }
 ci = { depends_on = [
   "format",

{holobench-1.23.0 → holobench-1.24.0}/test/test_bench_examples.py

@@ -9,6 +9,7 @@ from bencher.example.example_time_event import run_example_time_event
 from bencher.example.example_float3D import example_floats3D
 
 from bencher.example.example_custom_sweep import example_custom_sweep
+from bencher.example.example_custom_sweep2 import example_custom_sweep2
 from bencher.example.example_workflow import example_floats2D_workflow, example_floats3D_workflow
 from bencher.example.example_holosweep import example_holosweep
 from bencher.example.example_holosweep_tap import example_holosweep_tap
@@ -85,6 +86,9 @@ class TestBenchExamples(unittest.TestCase):
     def test_example_custom_sweep(self) -> None:
         self.examples_asserts(example_custom_sweep(self.create_run_cfg()))
 
+    def test_example_custom2(self) -> None:
+        self.examples_asserts(example_custom_sweep2(self.create_run_cfg()))
+
     def test_example_floats2D_workflow(self) -> None:
         self.examples_asserts(example_floats2D_workflow(self.create_run_cfg()))