holobench 1.23.0__py3-none-any.whl → 1.25.0__py3-none-any.whl

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,

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.dist-info → holobench-1.25.0.dist-info}/METADATA

@@ -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.dist-info → holobench-1.25.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-bencher/__init__.py,sha256=XCrJ5Nbw3k1J6j8qVEf6kH5sMmECIXzII-t9SdB8gEI,1558
+bencher/__init__.py,sha256=gywyMfCkWiguR86HWU63s06Ts9coSY_CK2ro2V7RIbI,1561
 bencher/bench_cfg.py,sha256=8rvJyeQXalZmYF8Lb-NKb9RFJs0w08k9ogcZSR1rhgs,18413
 bencher/bench_plot_server.py,sha256=D00_SOrHa2IT8zAjwetoNL6tEiHSHvXnbea9iElCLVk,4195
 bencher/bench_report.py,sha256=jh3T_q9KByZDeMPMf0KNJojZukxRzkfaYGeuWQU8MKM,10528
 bencher/bench_runner.py,sha256=-SzAKd6QbPJ05KaW3vteFIkE-UtlFS55Ob9QeE5eRXw,6202
-bencher/bencher.py,sha256=SlSje8ZvWdRnmRs4ZLXGx3bDQRMHkDOgvyBIsLClUTE,33400
+bencher/bencher.py,sha256=45CaQhe9ATh4zdUBwWER_9qQWoc_U6rGeZbPa0bCXEc,34545
 bencher/caching.py,sha256=AusaNrzGGlj5m6zcwcqnTn55Mam2mQdF--oqelO806M,1627
 bencher/class_enum.py,sha256=kYHW9qKkKcNdwaXizZL-fTptS_DUEGv4c88yCehk3gc,1492
 bencher/job.py,sha256=swa0VwrZf41v7qNjreVDIYUU6r_dfuLipPZbg_w5x7c,6089
@@ -11,10 +11,10 @@ bencher/optuna_conversions.py,sha256=an-LfPsQXyyvhIZnG8Wl1RQVYMvJj7WOi3YNqoUnuxQ
 bencher/utils.py,sha256=9KAThtIG8jNd0nd4Wft8miNM_yHWmZUkIBfJh19pzgI,6480
 bencher/video_writer.py,sha256=B-V1tALd3oPDytaAsl8I6qUztDQlFbkp9gSYco-ah44,2175
 bencher/worker_job.py,sha256=FREi0yWQACFmH86R1j-LH72tALEFkKhLDmmoGQY9Jh4,1571
-holobench-1.23.0.data/data/share/ament_index/resource_index/packages/bencher,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holobench-1.23.0.data/data/share/bencher/package.xml,sha256=HxWM9qIEiLbE60tG0aKsS7q3UaSKDyCMD4-1nYw8vOs,1045
-holobench-1.23.0.dist-info/LICENSE,sha256=dSHXTdRY4Y7qGFMv63UksV700iff7iE-p7GGs6Sbnvo,1065
-holobench-1.23.0.dist-info/METADATA,sha256=UrC2MLXikRWBDwgLOqPo0OFgM6079n6ciWTnkktDZX4,5691
-holobench-1.23.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-holobench-1.23.0.dist-info/top_level.txt,sha256=rkP5-F_W08mOD-25ZPkt0HJsHxedb2EiRcRA7IP6Ceg,8
-holobench-1.23.0.dist-info/RECORD,,
+holobench-1.25.0.data/data/share/ament_index/resource_index/packages/bencher,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+holobench-1.25.0.data/data/share/bencher/package.xml,sha256=HxWM9qIEiLbE60tG0aKsS7q3UaSKDyCMD4-1nYw8vOs,1045
+holobench-1.25.0.dist-info/LICENSE,sha256=dSHXTdRY4Y7qGFMv63UksV700iff7iE-p7GGs6Sbnvo,1065
+holobench-1.25.0.dist-info/METADATA,sha256=pExSccJNRC6UWisUwAdp5PmWCNVhm1VvkhZ-gShZtw8,5691
+holobench-1.25.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+holobench-1.25.0.dist-info/top_level.txt,sha256=rkP5-F_W08mOD-25ZPkt0HJsHxedb2EiRcRA7IP6Ceg,8
+holobench-1.25.0.dist-info/RECORD,,