holobench 1.27.0__tar.gz → 1.28.0__tar.gz

{holobench-1.27.0/holobench.egg-info → holobench-1.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.27.0
+Version: 1.28.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Project-URL: Repository, https://github.com/dyson-ai/bencher
@@ -9,7 +9,7 @@ Project-URL: Documentation, https://bencher.readthedocs.io/en/latest/
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: holoviews<=1.19.0,>=1.15
-Requires-Dist: numpy<=1.26.4,>=1.0
+Requires-Dist: numpy<=2.0.0,>=1.0
 Requires-Dist: param<=2.1.0,>=1.13.0
 Requires-Dist: hvplot<=0.10.0,>=0.8
 Requires-Dist: matplotlib<=3.9.0,>=3.6.3
@@ -31,7 +31,7 @@ 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.2,>=7.4; extra == "test"
 Requires-Dist: hypothesis<=6.103.2,>=6.82; extra == "test"
-Requires-Dist: ruff<=0.4.9,>=0.0.280; extra == "test"
+Requires-Dist: ruff<=0.4.10,>=0.0.280; extra == "test"
 Requires-Dist: coverage<=7.5.3,>=7.2.7; extra == "test"
 
 # Bencher
@@ -90,4 +90,4 @@ Bencher is designed to work with stochastic pure functions with no side effects.
     
 ### Example Output
 
-https://dyson-ai.github.io/bencher/
+https://dyson-ai.github.io/bencher/ 

{holobench-1.27.0 → holobench-1.28.0}/README.md

@@ -54,4 +54,4 @@ Bencher is designed to work with stochastic pure functions with no side effects.
     
 ### Example Output
 
-https://dyson-ai.github.io/bencher/
+https://dyson-ai.github.io/bencher/ 

{holobench-1.27.0 → holobench-1.28.0}/bencher/bencher.py

@@ -280,40 +280,42 @@ class Bench(BenchPlotServer):
             BenchResult: A class with all the data used to generate the results and the results
         """
 
+        input_vars_in = deepcopy(input_vars)
+        result_vars_in = deepcopy(result_vars)
+        const_vars_in = deepcopy(const_vars)
+
         if self.worker_class_instance is not None:
-            if input_vars is None:
+            if input_vars_in is None:
                 logging.info(
                     "No input variables passed, using all param variables in bench class as inputs"
                 )
                 if self.input_vars is None:
-                    input_vars = self.worker_class_instance.get_inputs_only()
+                    input_vars_in = self.worker_class_instance.get_inputs_only()
                 else:
-                    input_vars = self.input_vars
-                for i in input_vars:
+                    input_vars_in = deepcopy(self.input_vars)
+                for i in input_vars_in:
                     logging.info(f"input var: {i.name}")
-            if result_vars is None:
+            if result_vars_in is None:
                 logging.info(
                     "No results variables passed, using all result variables in bench class:"
                 )
                 if self.result_vars is None:
-                    result_vars = self.worker_class_instance.get_results_only()
+                    result_vars_in = self.worker_class_instance.get_results_only()
                 else:
-                    result_vars = self.result_vars
+                    result_vars_in = deepcopy(self.result_vars)
 
-            if const_vars is None:
+            if const_vars_in is None:
                 if self.const_vars is None:
-                    const_vars = self.worker_class_instance.get_input_defaults()
+                    const_vars_in = self.worker_class_instance.get_input_defaults()
                 else:
-                    const_vars = self.const_vars
+                    const_vars_in = deepcopy(self.const_vars)
         else:
-            if input_vars is None:
-                input_vars = []
-            if result_vars is None:
-                result_vars = []
-            if const_vars is None:
-                const_vars = []
-            else:
-                const_vars = deepcopy(const_vars)
+            if input_vars_in is None:
+                input_vars_in = []
+            if result_vars_in is None:
+                result_vars_in = []
+            if const_vars_in is None:
+                const_vars_in = []
 
         if run_cfg is None:
             if self.run_cfg is None:
@@ -328,9 +330,9 @@ class Bench(BenchPlotServer):
 
         self.last_run_cfg = run_cfg
 
-        if isinstance(input_vars, dict):
+        if isinstance(input_vars_in, dict):
             input_lists = []
-            for k, v in input_vars.items():
+            for k, v in input_vars_in.items():
                 param_var = self.convert_vars_to_params(k, "input", run_cfg)
                 if isinstance(v, list):
                     assert len(v) > 0
@@ -340,56 +342,56 @@ class Bench(BenchPlotServer):
                     raise RuntimeError("Unsupported type")
                 input_lists.append(param_var)
 
-            input_vars = input_lists
+            input_vars_in = 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 i in range(len(input_vars_in)):
+                input_vars_in[i] = self.convert_vars_to_params(input_vars_in[i], "input", run_cfg)
+        for i in range(len(result_vars_in)):
+            result_vars_in[i] = self.convert_vars_to_params(result_vars_in[i], "result", run_cfg)
 
-        for r in result_vars:
+        for r in result_vars_in:
             logging.info(f"result var: {r.name}")
 
-        if isinstance(const_vars, dict):
-            const_vars = list(const_vars.items())
+        if isinstance(const_vars_in, dict):
+            const_vars_in = list(const_vars_in.items())
 
-        for i in range(len(const_vars)):
+        for i in range(len(const_vars_in)):
             # consts come as tuple pairs
-            cv_list = list(const_vars[i])
+            cv_list = list(const_vars_in[i])
             cv_list[0] = self.convert_vars_to_params(cv_list[0], "const", run_cfg)
-            const_vars[i] = cv_list
+            const_vars_in[i] = cv_list
 
         if title is None:
-            if len(input_vars) > 0:
-                title = "Sweeping " + " vs ".join([i.name for i in input_vars])
-            elif len(const_vars) > 0:
+            if len(input_vars_in) > 0:
+                title = "Sweeping " + " vs ".join([i.name for i in input_vars_in])
+            elif len(const_vars_in) > 0:
                 title = "Constant Value"
-                if len(const_vars) > 1:
+                if len(const_vars_in) > 1:
                     title += "s"
-                title += ": " + ", ".join([f"{c[0].name}={c[1]}" for c in const_vars])
+                title += ": " + ", ".join([f"{c[0].name}={c[1]}" for c in const_vars_in])
             else:
                 raise RuntimeError("you must pass a title, or define inputs or consts")
 
         if run_cfg.level > 0:
             inputs = []
-            print(input_vars)
-            if len(input_vars) > 0:
-                for i in input_vars:
+            print(input_vars_in)
+            if len(input_vars_in) > 0:
+                for i in input_vars_in:
                     inputs.append(i.with_level(run_cfg.level))
-                input_vars = inputs
+                input_vars_in = inputs
 
         # if any of the inputs have been include as constants, remove those variables from the list of constants
         with suppress(ValueError, AttributeError):
-            for i in input_vars:
-                for c in const_vars:
+            for i in input_vars_in:
+                for c in const_vars_in:
                     # print(i.hash_persistent())
                     if i.name == c[0].name:
-                        const_vars.remove(c)
+                        const_vars_in.remove(c)
                         logging.info(f"removing {i.name} from constants")
 
         result_hmaps = []
         result_vars_only = []
-        for i in result_vars:
+        for i in result_vars_in:
             if isinstance(i, ResultHmap):
                 result_hmaps.append(i)
             else:
@@ -409,10 +411,10 @@ class Bench(BenchPlotServer):
             plot_callbacks = [BenchResult.to_auto_plots] if plot_callbacks else []
 
         bench_cfg = BenchCfg(
-            input_vars=input_vars,
+            input_vars=input_vars_in,
             result_vars=result_vars_only,
             result_hmaps=result_hmaps,
-            const_vars=const_vars,
+            const_vars=const_vars_in,
             bench_name=self.bench_name,
             description=description,
             post_description=post_description,

{holobench-1.27.0 → holobench-1.28.0}/bencher/variables/parametrised_sweep.py

@@ -7,6 +7,7 @@ import panel as pn
 
 from bencher.utils import make_namedtuple, hash_sha1
 from bencher.variables.results import ALL_RESULT_TYPES, ResultHmap
+from bencher.bench_cfg import BenchRunCfg
 
 
 class ParametrizedSweep(Parameterized):
@@ -197,7 +198,8 @@ class ParametrizedSweep(Parameterized):
     def plot_hmap(self, **kwargs):
         return self.__call__(**kwargs)["hmap"]
 
-    def to_bench(self, run_cfg=None, report=None, name: str = None):
+    # TODO Add type hints here and fix the circular imports
+    def to_bench(self, run_cfg: BenchRunCfg = None, report=None, name: str = None):
         from bencher import Bench
 
         assert isinstance(self, ParametrizedSweep)

{holobench-1.27.0 → holobench-1.28.0/holobench.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.27.0
+Version: 1.28.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Project-URL: Repository, https://github.com/dyson-ai/bencher
@@ -9,7 +9,7 @@ Project-URL: Documentation, https://bencher.readthedocs.io/en/latest/
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: holoviews<=1.19.0,>=1.15
-Requires-Dist: numpy<=1.26.4,>=1.0
+Requires-Dist: numpy<=2.0.0,>=1.0
 Requires-Dist: param<=2.1.0,>=1.13.0
 Requires-Dist: hvplot<=0.10.0,>=0.8
 Requires-Dist: matplotlib<=3.9.0,>=3.6.3
@@ -31,7 +31,7 @@ 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.2,>=7.4; extra == "test"
 Requires-Dist: hypothesis<=6.103.2,>=6.82; extra == "test"
-Requires-Dist: ruff<=0.4.9,>=0.0.280; extra == "test"
+Requires-Dist: ruff<=0.4.10,>=0.0.280; extra == "test"
 Requires-Dist: coverage<=7.5.3,>=7.2.7; extra == "test"
 
 # Bencher
@@ -90,4 +90,4 @@ Bencher is designed to work with stochastic pure functions with no side effects.
     
 ### Example Output
 
-https://dyson-ai.github.io/bencher/
+https://dyson-ai.github.io/bencher/ 

{holobench-1.27.0 → holobench-1.28.0}/holobench.egg-info/requires.txt

@@ -1,5 +1,5 @@
 holoviews<=1.19.0,>=1.15
-numpy<=1.26.4,>=1.0
+numpy<=2.0.0,>=1.0
 param<=2.1.0,>=1.13.0
 hvplot<=0.10.0,>=0.8
 matplotlib<=3.9.0,>=3.6.3
@@ -22,5 +22,5 @@ pylint<=3.2.3,>=2.17.7
 pytest-cov<=5.0.0,>=4.1
 pytest<=8.2.2,>=7.4
 hypothesis<=6.103.2,>=6.82
-ruff<=0.4.9,>=0.0.280
+ruff<=0.4.10,>=0.0.280
 coverage<=7.5.3,>=7.2.7

{holobench-1.27.0 → holobench-1.28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.27.0"
+version = "1.28.0"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -8,7 +8,7 @@ readme = "README.md"
 
 dependencies = [
   "holoviews>=1.15,<=1.19.0",
-  "numpy>=1.0,<=1.26.4",
+  "numpy>=1.0,<=2.0.0",
   "param>=1.13.0,<=2.1.0",
   "hvplot>=0.8,<=0.10.0",
   "matplotlib>=3.6.3,<=3.9.0",
@@ -49,7 +49,7 @@ test = [
   "pytest-cov>=4.1,<=5.0.0",
   "pytest>=7.4,<=8.2.2",
   "hypothesis>=6.82,<=6.103.2",
-  "ruff>=0.0.280,<=0.4.9",
+  "ruff>=0.0.280,<=0.4.10",
   "coverage>=7.2.7,<=7.5.3",
 ]
 
@@ -67,9 +67,9 @@ include = ["bencher"]
 
 # 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"]
 
 [tool.pixi.tasks]
 format = "black ."
@@ -78,16 +78,15 @@ ruff-lint = "ruff check . --fix"
 pylint = "pylint --version && echo 'running pylint...' && pylint $(git ls-files '*.py')"
 lint = { depends_on = ["ruff-lint", "pylint"] }
 style = { depends_on = ["format", "lint"] }
-commit-format = "git commit -a -m'autoformat code'"
+commit-format = "git commit -a -m'autoformat code' || true"
 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"] }
+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-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] }
-
 ci-no-cover = { depends_on = ["style", "test"] }
 ci = { depends_on = [
   "format",
@@ -99,6 +98,8 @@ ci = { depends_on = [
 ] }
 ci-push = { depends_on = ["format", "ruff-lint", "update-lock", "ci", "push"] }
 clear-pixi = "rm -rf .pixi pixi.lock"
+setup-git-merge-driver = "git config merge.ours.driver true"
+update-from-template-repo = "./scripts/update_from_template.sh"
 
 [tool.pylint]
 extension-pkg-whitelist = ["numpy", "scipy"]

{holobench-1.27.0 → holobench-1.28.0}/test/test_sweep_base.py

@@ -96,6 +96,17 @@ class TestSweepBase(unittest.TestCase):
         instance_defaults = exp.get_input_defaults([exp.param.var_float.with_const(2)])
         self.assertEqual(instance_defaults[0][1], 2)
 
+    def test_default_values_override(self):
+
+        initial = AllSweepVars.get_input_defaults()
+
+        overrride_defaults = AllSweepVars.get_input_defaults_override()
+        override = AllSweepVars.get_input_defaults_override(var_float=1)
+        after = AllSweepVars.get_input_defaults()
+
+        self.assertListEqual(initial, after)
+        self.assertNotEqual(override, overrride_defaults)
+
     def test_with_sample_values(self):
         vals = AllSweepVars.param.var_float.with_sample_values([0, 1]).values()
         self.assertEqual(vals[0], 0)