holobench 1.24.0__tar.gz → 1.25.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.24.0
+Version: 1.25.1
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Maintainer: austin.gregg-smith
@@ -29,11 +29,11 @@ Requires-Dist: scoop<=0.7.2.0,>=0.7.0
 Requires-Dist: moviepy<=1.0.3,>=1.0.3
 Provides-Extra: test
 Requires-Dist: black<=24.4.2,>=23; extra == "test"
-Requires-Dist: pylint<=3.2.2,>=2.17.7; extra == "test"
+Requires-Dist: pylint<=3.2.3,>=2.17.7; extra == "test"
 Requires-Dist: pytest-cov<=5.0.0,>=4.1; extra == "test"
-Requires-Dist: pytest<=8.2.1,>=7.4; extra == "test"
-Requires-Dist: hypothesis<=6.103.0,>=6.82; extra == "test"
-Requires-Dist: ruff<=0.4.7,>=0.3; extra == "test"
+Requires-Dist: pytest<=8.2.2,>=7.4; extra == "test"
+Requires-Dist: hypothesis<=6.103.1,>=6.82; extra == "test"
+Requires-Dist: ruff<=0.4.8,>=0.0.280; extra == "test"
 Requires-Dist: coverage<=7.5.3,>=7.2.7; extra == "test"
 
 # Bencher

{holobench-1.24.0 → holobench-1.25.1}/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.24.0 → holobench-1.25.1}/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,13 +315,27 @@ class Bench(BenchPlotServer):
             else:
                 const_vars = deepcopy(const_vars)
 
+        if run_cfg is None:
+            if self.run_cfg is None:
+                run_cfg = BenchRunCfg()
+                logging.info("Generate default run cfg")
+            else:
+                run_cfg = deepcopy(self.run_cfg)
+                logging.info("Copy run cfg from bench class")
+
+        if run_cfg.only_plot:
+            run_cfg.use_cache = True
+
+        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")
+                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)
@@ -329,9 +343,9 @@ class Bench(BenchPlotServer):
             input_vars = input_lists
         else:
             for i in range(len(input_vars)):
-                input_vars[i] = self.convert_vars_to_params(input_vars[i], "input")
+                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")
+            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}")
@@ -342,22 +356,9 @@ class Bench(BenchPlotServer):
         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")
+            cv_list[0] = self.convert_vars_to_params(cv_list[0], "const", run_cfg)
             const_vars[i] = cv_list
 
-        if run_cfg is None:
-            if self.run_cfg is None:
-                run_cfg = BenchRunCfg()
-                logging.info("Generate default run cfg")
-            else:
-                run_cfg = deepcopy(self.run_cfg)
-                logging.info("Copy run cfg from bench class")
-
-        if run_cfg.only_plot:
-            run_cfg.use_cache = True
-
-        self.last_run_cfg = run_cfg
-
         if title is None:
             if len(input_vars) > 0:
                 title = "Sweeping " + " vs ".join([i.name for i in input_vars])
@@ -485,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:
@@ -497,10 +503,17 @@ 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 isinstance(variable, dict):
+            param_var = self.worker_class_instance.param.objects(instance=False)[variable["name"]]
+            if variable.get("values"):
+                param_var = param_var.with_sample_values(variable["values"])
+
+            if variable.get("samples"):
+                param_var = param_var.with_samples(variable["samples"])
+            if variable.get("max_level"):
+                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.24.0 → holobench-1.25.1/holobench.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.24.0
+Version: 1.25.1
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Maintainer: austin.gregg-smith
@@ -29,11 +29,11 @@ Requires-Dist: scoop<=0.7.2.0,>=0.7.0
 Requires-Dist: moviepy<=1.0.3,>=1.0.3
 Provides-Extra: test
 Requires-Dist: black<=24.4.2,>=23; extra == "test"
-Requires-Dist: pylint<=3.2.2,>=2.17.7; extra == "test"
+Requires-Dist: pylint<=3.2.3,>=2.17.7; extra == "test"
 Requires-Dist: pytest-cov<=5.0.0,>=4.1; extra == "test"
-Requires-Dist: pytest<=8.2.1,>=7.4; extra == "test"
-Requires-Dist: hypothesis<=6.103.0,>=6.82; extra == "test"
-Requires-Dist: ruff<=0.4.7,>=0.3; extra == "test"
+Requires-Dist: pytest<=8.2.2,>=7.4; extra == "test"
+Requires-Dist: hypothesis<=6.103.1,>=6.82; extra == "test"
+Requires-Dist: ruff<=0.4.8,>=0.0.280; extra == "test"
 Requires-Dist: coverage<=7.5.3,>=7.2.7; extra == "test"
 
 # Bencher

{holobench-1.24.0 → holobench-1.25.1}/holobench.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ holobench.egg-info/not-zip-safe
 holobench.egg-info/requires.txt
 holobench.egg-info/top_level.txt
 resource/bencher
+test/test_bch_p.py
 test/test_bench_examples.py
 test/test_bench_report.py
 test/test_bench_result_base.py

{holobench-1.24.0 → holobench-1.25.1}/holobench.egg-info/requires.txt

@@ -18,9 +18,9 @@ moviepy<=1.0.3,>=1.0.3
 
 [test]
 black<=24.4.2,>=23
-pylint<=3.2.2,>=2.17.7
+pylint<=3.2.3,>=2.17.7
 pytest-cov<=5.0.0,>=4.1
-pytest<=8.2.1,>=7.4
-hypothesis<=6.103.0,>=6.82
-ruff<=0.4.7,>=0.3
+pytest<=8.2.2,>=7.4
+hypothesis<=6.103.1,>=6.82
+ruff<=0.4.8,>=0.0.280
 coverage<=7.5.3,>=7.2.7

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

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.24.0"
+version = "1.25.1"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -42,14 +42,17 @@ python = "3.11.*"
 [tool.pixi.pypi-dependencies]
 holobench = { path = ".", editable = true }
 
+[tool.pixi.feature.devenv.pypi-dependencies]
+deps-rocker = ">=0.2"
+
 [project.optional-dependencies]
 test = [
   "black>=23,<=24.4.2",
-  "pylint>=2.17.7,<=3.2.2",
+  "pylint>=2.17.7,<=3.2.3",
   "pytest-cov>=4.1,<=5.0.0",
-  "pytest>=7.4,<=8.2.1",
-  "hypothesis>=6.82,<=6.103.0",
-  "ruff>=0.3,<=0.4.7",
+  "pytest>=7.4,<=8.2.2",
+  "hypothesis>=6.82,<=6.103.1",
+  "ruff>=0.0.280,<=0.4.8",
   "coverage>=7.2.7,<=7.5.3",
 ]
 
@@ -64,9 +67,13 @@ build-backend = "setuptools.build_meta"
 
 # Environments
 [tool.pixi.environments]
-default = { features = ["test"], solve-group = "default" }
-py310 = ["py310", "test"]
-py311 = ["py311", "test"]
+default = {features = ["test"], solve-group = "default" }
+py310 = ["py310","test"]
+py311 = ["py311","test"]
+devenv =["devenv"]
+
+[tool.pixi.feature.devenv.tasks]
+code = "scripts/launch_vscode.sh"
 
 [tool.pixi.tasks]
 format = "black ."
@@ -106,7 +113,7 @@ extension-pkg-whitelist = ["numpy", "scipy"]
 jobs = 16                                    #detect number of cores
 
 [tool.pylint.'MESSAGES CONTROL']
-disable = "C,logging-fstring-interpolation,line-too-long,fixme,missing-module-docstring,too-many-instance-attributes,too-few-public-methods,too-many-arguments,too-many-locals,too-many-branches,too-many-statements,use-dict-literal,duplicate-code,too-many-public-methods,too-many-nested-blocks"
+disable = "C,logging-fstring-interpolation,line-too-long,fixme,missing-module-docstring,too-many-instance-attributes,too-few-public-methods,too-many-arguments,too-many-locals,too-many-branches,too-many-statements,use-dict-literal,duplicate-code,too-many-public-methods,too-many-nested-blocks,cyclic-import"
 enable = "no-else-return,consider-using-in"
 
 [tool.black]

holobench-1.25.1/test/test_bch_p.py

@@ -0,0 +1,37 @@
+# Generated by CodiumAI
+
+import pytest
+from bencher import p
+
+
+class TestP:
+
+    # returns correct dictionary with all parameters provided
+    def test_returns_correct_dict_all_params(self):
+        result = p(name="param1", values=[1, 2, 3], samples=10, max_level=5)
+        assert result == {"name": "param1", "values": [1, 2, 3], "samples": 10, "max_level": 5}
+
+    # returns correct dictionary with only name provided
+    def test_returns_correct_dict_name_only(self):
+        result = p(name="param1")
+        assert result == {"name": "param1", "values": None, "samples": None, "max_level": None}
+
+    # returns correct dictionary with name and values provided
+    def test_returns_correct_dict_name_and_values(self):
+        result = p(name="param1", values=[1, 2, 3])
+        assert result == {"name": "param1", "values": [1, 2, 3], "samples": None, "max_level": None}
+
+    # raises ValueError when max_level is 0
+    def test_raises_value_error_max_level_zero(self):
+        with pytest.raises(ValueError, match="max_level must be greater than 0"):
+            p(name="param1", max_level=0)
+
+    # raises ValueError when max_level is negative
+    def test_raises_value_error_max_level_negative(self):
+        with pytest.raises(ValueError, match="max_level must be greater than 0"):
+            p(name="param1", max_level=-1)
+
+    # raises ValueError when samples is 0
+    def test_raises_value_error_samples_zero(self):
+        with pytest.raises(ValueError, match="samples must be greater than 0"):
+            p(name="param1", samples=0)

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

@@ -4,12 +4,15 @@ from bencher.example.example_floats2D import example_floats2D
 from bencher.example.example_pareto import example_pareto
 from bencher.example.example_simple_cat import example_1D_cat
 from bencher.example.example_simple_float import example_1D_float
+from bencher.example.example_simple_float2d import example_2D_float
+from bencher.example.example_consts import example_2D_float_const
 from bencher.example.example_float_cat import run_example_float_cat
 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
@@ -74,6 +77,15 @@ class TestBenchExamples(unittest.TestCase):
     def test_example_simple_float(self) -> None:
         self.examples_asserts(example_1D_float(self.create_run_cfg()))
 
+    def test_example_simple_float1D(self) -> None:
+        self.examples_asserts(example_1D_float(self.create_run_cfg()))
+
+    def test_example_simple_float2D(self) -> None:
+        self.examples_asserts(example_2D_float(self.create_run_cfg()))
+
+    def test_example_2D_float_const(self) -> None:
+        self.examples_asserts(example_2D_float_const(self.create_run_cfg()))
+
     def test_example_float_cat(self) -> None:
         self.examples_asserts(run_example_float_cat(self.create_run_cfg()))
 
@@ -89,6 +101,9 @@ class TestBenchExamples(unittest.TestCase):
     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()))