holobench 1.23.0__tar.gz → 1.25.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.23.0
+Version: 1.25.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.25.0}/bencher/__init__.py

@@ -6,7 +6,7 @@ from .variables.sweep_base import hash_sha1
 from .variables.inputs import IntSweep, FloatSweep, StringSweep, EnumSweep, BoolSweep, SweepBase
 from .variables.time import TimeSnapshot
 
-from .variables.inputs import box
+from .variables.inputs import box, p
 from .variables.results import (
     ResultVar,
     ResultVec,

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

@@ -2,7 +2,7 @@ import logging
 from datetime import datetime
 from itertools import product, combinations
 
-from typing import Callable, List
+from typing import Callable, List, Optional
 from copy import deepcopy
 import numpy as np
 import param
@@ -315,23 +315,6 @@ 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")
-        for i in range(len(result_vars)):
-            result_vars[i] = self.convert_vars_to_params(result_vars[i], "result")
-
-        for r in result_vars:
-            logging.info(f"result var: {r.name}")
-
-        if isinstance(const_vars, dict):
-            const_vars = list(const_vars.items())
-
-        for i in range(len(const_vars)):
-            # consts come as tuple pairs
-            cv_list = list(const_vars[i])
-            cv_list[0] = self.convert_vars_to_params(cv_list[0], "const")
-            const_vars[i] = cv_list
-
         if run_cfg is None:
             if self.run_cfg is None:
                 run_cfg = BenchRunCfg()
@@ -345,6 +328,37 @@ class Bench(BenchPlotServer):
 
         self.last_run_cfg = run_cfg
 
+        if isinstance(input_vars, dict):
+            input_lists = []
+            for k, v in input_vars.items():
+                param_var = self.convert_vars_to_params(k, "input", run_cfg)
+                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", run_cfg)
+        for i in range(len(result_vars)):
+            result_vars[i] = self.convert_vars_to_params(result_vars[i], "result", run_cfg)
+
+        for r in result_vars:
+            logging.info(f"result var: {r.name}")
+
+        if isinstance(const_vars, dict):
+            const_vars = list(const_vars.items())
+
+        for i in range(len(const_vars)):
+            # consts come as tuple pairs
+            cv_list = list(const_vars[i])
+            cv_list[0] = self.convert_vars_to_params(cv_list[0], "const", run_cfg)
+            const_vars[i] = cv_list
+
         if title is None:
             if len(input_vars) > 0:
                 title = "Sweeping " + " vs ".join([i.name for i in input_vars])
@@ -472,7 +486,12 @@ class Bench(BenchPlotServer):
         self.results.append(bench_res)
         return bench_res
 
-    def convert_vars_to_params(self, variable: param.Parameter, var_type: str):
+    def convert_vars_to_params(
+        self,
+        variable: param.Parameter | str | dict | tuple,
+        var_type: str,
+        run_cfg: Optional[BenchRunCfg],
+    ) -> param.Parameter:
         """check that a variable is a subclass of param
 
         Args:
@@ -484,6 +503,14 @@ class Bench(BenchPlotServer):
         """
         if isinstance(variable, str):
             variable = self.worker_class_instance.param.objects(instance=False)[variable]
+        if isinstance(variable, dict):
+            param_var = self.worker_class_instance.param.objects(instance=False)[variable["name"]]
+            if variable["values"] is not None:
+                param_var = param_var.with_sample_values(variable["values"])
+            if variable["max_level"] is not None:
+                if run_cfg is not None:
+                    param_var = param_var.with_level(run_cfg.level, variable["max_level"])
+            variable = param_var
         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.25.0/holobench.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.23.0
+Version: 1.25.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.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.23.0"
+version = "1.25.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.25.0}/test/test_bench_examples.py

@@ -9,6 +9,8 @@ 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_levels2 import example_levels2
 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 +87,12 @@ 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_level2(self) -> None:
+        self.examples_asserts(example_levels2(self.create_run_cfg()))
+
     def test_example_floats2D_workflow(self) -> None:
         self.examples_asserts(example_floats2D_workflow(self.create_run_cfg()))