holobench 1.26.3__py3-none-any.whl → 1.28.0__py3-none-any.whl

bencher/bench_report.py

@@ -157,112 +157,9 @@ class BenchReport(BenchPlotServer):
 
         return publish_url
 
-
-# def append(self,pane):
-# self.report.append(pane)
-
-# def __getstate__(self):
-#     state = self.__dict__.copy()
-#     # Don't pickle baz
-#     del state["pane"]
-#     return state
-
-# def __setstate__(self, state):
-#     self.__dict__.update(state)
-#     # Add baz back since it doesn't exist in the pickle
-#     self.report = []
-
-# def publish_old(
-#     self,
-#     directory: str = "bench_results",
-#     branch_name: str = "bench_results",
-#     url_postprocess: Callable = None,
-#     **kwargs,
-# ) -> str:
-#     """Publish the results as an html file by committing it to the bench_results branch in the current repo. If you have set up your repo with github pages or equivalent then the html file will be served as a viewable webpage.
-
-#     Args:
-#         directory (str, optional): Directory to save the results. Defaults to "bench_results".
-#         branch_name (str, optional): Branch to publish on. Defaults to "bench_results".
-#         url_postprocess (Callable, optional): A function that maps the origin url to a github pages url. Pass your own function if you are using another git providers. Defaults to None.
-
-#     Returns:
-#         str: _description_
-#     """
-
-#     def get_output(cmd: str) -> str:
-#         return (
-#             subprocess.run(cmd.split(" "), stdout=subprocess.PIPE, check=False)
-#             .stdout.decode("utf=8")
-#             .strip()
-#         )
-
-#     def postprocess_url(publish_url: str, branch_name: str, report_path: str, **kwargs) -> str:
-#         # import re
-
-#         # return re.sub(
-#         #     """((git|ssh|http(s)?)|(git@[\w\.-]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?""",
-#         #     """https://$7/""",
-#         #     publish_url,
-#         # )
-#         # git@github.com:user/project.git
-#         # https://github.com/user/project.git
-#         # http://github.com/user/project.git
-#         # git@192.168.101.127:user/project.git
-#         # https://192.168.101.127/user/project.git
-#         # http://192.168.101.127/user/project.git
-#         # ssh://user@host.xz:port/path/to/repo.git/
-#         # ssh://user@host.xz/path/to/repo.git/
-#         # ssh://host.xz:port/path/to/repo.git/
-#         # ssh://host.xz/path/to/repo.git/
-#         # ssh://user@host.xz/path/to/repo.git/
-#         # ssh://host.xz/path/to/repo.git/
-#         # ssh://user@host.xz/~user/path/to/repo.git/
-#         # ssh://host.xz/~user/path/to/repo.git/
-#         # ssh://user@host.xz/~/path/to/repo.git
-#         # ssh://host.xz/~/path/to/repo.git
-#         # git://host.xz/path/to/repo.git/
-#         # git://host.xz/~user/path/to/repo.git/
-#         # http://host.xz/path/to/repo.git/
-#         # https://host.xz/path/to/repo.git/
-#         # https://regex101.com/r/qT7NP0/3
-
-#         return publish_url.replace(".git", f"/blob/{directory}/{report_path}")
-
-#     if url_postprocess is None:
-#         url_postprocess = postprocess_url
-#     current_branch = get_output("git symbolic-ref --short HEAD")
-#     logging.info(f"on branch: {current_branch}")
-#     stash_msg = get_output("git stash")
-#     logging.info(f"stashing current work :{stash_msg}")
-#     checkout_msg = get_output(f"git checkout -b {branch_name}")
-#     checkout_msg = get_output(f"git checkout {branch_name}")
-#     get_output("git pull")
-
-#     logging.info(f"checking out branch: {checkout_msg}")
-#     report_path = self.save(directory, in_html_folder=False)
-#     logging.info(f"created report at: {report_path.absolute()}")
-#     # commit_msg = f""
-#     logging.info("adding report to git")
-#     get_output(f"git add {report_path.absolute()}")
-#     get_output("git status")
-#     logging.info("committing report")
-#     cmd = f'git commit -m "generate_report:{self.bench_name}"'
-#     logging.info(cmd)
-#     get_output(cmd)
-#     logging.info("pushing report to origin")
-#     get_output(f"git push --set-upstream origin {branch_name}")
-#     logging.info("checking out original branch")
-#     get_output(f"git checkout {current_branch}")
-#     if "No local changes" not in stash_msg:
-#         logging.info("restoring work with git stash pop")
-#         get_output("git stash pop")
-
-#     publish_url = get_output("git remote get-url --push origin")
-#     logging.info(f"raw url:{publish_url}")
-#     publish_url = url_postprocess(
-#         publish_url, branch_name=branch_name, report_path=report_path, **kwargs
-#     )
-#     logging.info("Published report @")
-#     logging.info(publish_url)
-#     return publish_url
+    # @staticmethod
+    # def publish_github(github_user: str, repo_name: str, branch_name: str) -> Tuple[str, str]:
+    #     return (
+    #         f"https://github.com/{github_user}/{repo_name}.git",
+    #         f"https://github.com/{github_user}/{repo_name}/blob/{branch_name}",
+    #     )

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,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.26.3
+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.26.3.dist-info → holobench-1.28.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 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_report.py,sha256=95K4ubVGXyyGO40fsdFysgPmxrI6JbXpQKdMiahm7KI,6365
 bencher/bench_runner.py,sha256=-SzAKd6QbPJ05KaW3vteFIkE-UtlFS55Ob9QeE5eRXw,6202
-bencher/bencher.py,sha256=-7XaSZWVzaXHQcKlHqPiUwsrKzYlPKBrimh9ahp8vsI,34642
+bencher/bencher.py,sha256=7L5h1vRSPwRcmp8iCNhFNLj1LoV-IhPr719BQBpdgvs,34883
 bencher/caching.py,sha256=AusaNrzGGlj5m6zcwcqnTn55Mam2mQdF--oqelO806M,1627
 bencher/class_enum.py,sha256=kYHW9qKkKcNdwaXizZL-fTptS_DUEGv4c88yCehk3gc,1492
 bencher/job.py,sha256=swa0VwrZf41v7qNjreVDIYUU6r_dfuLipPZbg_w5x7c,6089
@@ -80,14 +80,14 @@ bencher/results/composable_container/composable_container_panel.py,sha256=HrOoeG
 bencher/results/composable_container/composable_container_video.py,sha256=EHY2TIQM5ualrh_or-wzyErPWm25CaYdSdMotqo5wCo,7104
 bencher/variables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bencher/variables/inputs.py,sha256=tASPqEN7j_uaj8vfM1nFEpgV8QXrxTH3LfltIbV0Gp4,6725
-bencher/variables/parametrised_sweep.py,sha256=ZhLkuniIq2t_WPFi2kpuYRMZBEmqTpLpto3xDQ-iCpg,7277
+bencher/variables/parametrised_sweep.py,sha256=n3IN396Rnr1pBJqoxnMLLqC3KIJmAF4-zHupj7CQB58,7394
 bencher/variables/results.py,sha256=mjr34L27NFuXqUCI1GSO8srU8VFm8niTkaSZ1iPvvbY,7159
 bencher/variables/sweep_base.py,sha256=cOybffErb3_QUsCfiZa0mlVy9tGDueqiElZmc363apE,6258
 bencher/variables/time.py,sha256=A1QPYM-z2p-04hKcHG80u8njiKQ-2R2IHcjo7iB92_A,3136
-holobench-1.26.3.data/data/share/ament_index/resource_index/packages/bencher,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holobench-1.26.3.data/data/share/bencher/package.xml,sha256=HxWM9qIEiLbE60tG0aKsS7q3UaSKDyCMD4-1nYw8vOs,1045
-holobench-1.26.3.dist-info/LICENSE,sha256=dSHXTdRY4Y7qGFMv63UksV700iff7iE-p7GGs6Sbnvo,1065
-holobench-1.26.3.dist-info/METADATA,sha256=QjnUcDSF8-UoMYqFlJ6CGbv2lDE3f2HQAyh4NSzU5rw,5617
-holobench-1.26.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-holobench-1.26.3.dist-info/top_level.txt,sha256=rkP5-F_W08mOD-25ZPkt0HJsHxedb2EiRcRA7IP6Ceg,8
-holobench-1.26.3.dist-info/RECORD,,
+holobench-1.28.0.data/data/share/ament_index/resource_index/packages/bencher,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+holobench-1.28.0.data/data/share/bencher/package.xml,sha256=HxWM9qIEiLbE60tG0aKsS7q3UaSKDyCMD4-1nYw8vOs,1045
+holobench-1.28.0.dist-info/LICENSE,sha256=dSHXTdRY4Y7qGFMv63UksV700iff7iE-p7GGs6Sbnvo,1065
+holobench-1.28.0.dist-info/METADATA,sha256=ZdRokxk7t7l5wXwtHDycYoPffgRVD0yvca7JInGTHNg,5618
+holobench-1.28.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+holobench-1.28.0.dist-info/top_level.txt,sha256=rkP5-F_W08mOD-25ZPkt0HJsHxedb2EiRcRA7IP6Ceg,8
+holobench-1.28.0.dist-info/RECORD,,

{holobench-1.26.3.dist-info → holobench-1.28.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any