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

bencher/__init__.py

@@ -22,6 +22,15 @@ from .variables.results import (
     curve,
 )
 
+from .results.composable_container.composable_container_base import (
+    ComposeType,
+    ComposableContainerBase,
+)
+from .results.composable_container.composable_container_video import (
+    ComposableContainerVideo,
+    RenderCfg,
+)
+
 from .plotting.plot_filter import VarRange, PlotFilter
 from .utils import (
     hmap_canonical_input,

bencher/bench_runner.py

@@ -121,7 +121,7 @@ class BenchRunner:
                     self.show_publish(report_level, show, publish, save, debug)
         return self.results
 
-    def show_publish(self, report, show, publish, save, debug):
+    def show_publish(self, report: BenchReport, show: bool, publish: bool, save: bool, debug: bool):
         if save:
             report.save_index()
         if publish and self.publisher is not None:

bencher/bencher.py

@@ -220,9 +220,11 @@ class Bench(BenchPlotServer):
         relationship_cb=None,
         plot_callbacks: List | bool = None,
     ) -> List[BenchResult]:
-        results = []
         if relationship_cb is None:
             relationship_cb = combinations
+        if input_vars is None:
+            input_vars = self.worker_class_instance.get_inputs_only()
+        results = []
         for it in range(iterations):
             for input_group in relationship_cb(input_vars, group_size):
                 title_gen = title + "Sweeping " + " vs ".join(params_to_str(input_group))

bencher/optuna_conversions.py

@@ -1,4 +1,5 @@
 from typing import List
+import logging
 
 import optuna
 import panel as pn
@@ -158,8 +159,8 @@ def summarise_optuna_study(study: optuna.study.Study) -> pn.pane.panel:
     row.append(plot_param_importances(study))
     try:
         row.append(plot_pareto_front(study))
-    except Exception:
-        pass
+    except Exception as e:  # pylint: disable=broad-except
+        logging.exception(e)
 
     row.append(
         pn.pane.Markdown(f"```\nBest value: {study.best_value}\nParams: {study.best_params}```")

bencher/utils.py

@@ -8,8 +8,9 @@ from colorsys import hsv_to_rgb
 from pathlib import Path
 from uuid import uuid4
 from functools import partial
-from typing import Callable, Any, List
+from typing import Callable, Any, List, Tuple
 import param
+import numpy as np
 
 
 def hmap_canonical_input(dic: dict) -> tuple:
@@ -98,6 +99,10 @@ def un_camel(camel: str) -> str:
     return capitalise_words(re.sub("([a-z])([A-Z])", r"\g<1> \g<2>", camel.replace("_", " ")))
 
 
+def mult_tuple(inp: Tuple[float], val: float) -> Tuple[float]:
+    return tuple(np.array(inp) * val)
+
+
 def tabs_in_markdown(regular_str: str, spaces: int = 2) -> str:
     """Given a string with tabs in the form \t convert the to &ensp; which is a double space in markdown
 
@@ -142,13 +147,21 @@ def color_tuple_to_css(color: tuple[float, float, float]) -> str:
     return f"rgb{(color[0] * 255, color[1] * 255, color[2] * 255)}"
 
 
+def color_tuple_to_255(color: tuple[float, float, float]) -> tuple[float, float, float]:
+    return (
+        min(int(color[0] * 255), 255),
+        min(int(color[1] * 255), 255),
+        min(int(color[2] * 255), 255),
+    )
+
+
 def gen_path(filename, folder="generic", suffix=".dat"):
     path = Path(f"cachedir/{folder}/{filename}/")
     path.mkdir(parents=True, exist_ok=True)
     return f"{path.absolute().as_posix()}/{filename}_{uuid4()}{suffix}"
 
 
-def gen_video_path(video_name: str = "vid", extension: str = ".webm") -> str:
+def gen_video_path(video_name: str = "vid", extension: str = ".mp4") -> str:
     return gen_path(video_name, "vid", extension)
 
 

bencher/video_writer.py

@@ -4,13 +4,6 @@ from pathlib import Path
 from .utils import gen_video_path, gen_image_path
 
 import moviepy
-from moviepy.editor import (
-    VideoFileClip,
-    ImageClip,
-    ImageSequenceClip,
-    clips_array,
-    concatenate_videoclips,
-)
 from PIL import Image, ImageDraw
 
 
@@ -25,97 +18,50 @@ class VideoWriter:
         self.images.append(img)
 
     def write(self) -> str:
-        clip = moviepy.video.io.ImageSequenceClip.ImageSequenceClip(
-            self.images, fps=30, with_mask=False, load_images=True
-        )
-        self.write_video_raw(clip)
+        if len(self.images) > 0:
+            clip = moviepy.video.io.ImageSequenceClip.ImageSequenceClip(
+                self.images, fps=30, with_mask=False, load_images=True
+            )
+            self.write_video_raw(clip)
         return self.filename
 
     @staticmethod
-    def create_label(label, width=None, height=14):
+    def create_label(label, width=None, height=16, color=(255, 255, 255)):
         if width is None:
-            width = len(label) * 8
-        new_img = Image.new("RGB", (width, height), (255, 255, 255))
+            width = len(label) * 10
+        new_img = Image.new("RGB", (width, height), color=color)
         # ImageDraw.Draw(new_img).text((width/2, 0), label, (0, 0, 0),align="center",achor="ms")
-        ImageDraw.Draw(new_img).text((width / 2.0, 0), label, (0, 0, 0), anchor="mt", font_size=12)
+        ImageDraw.Draw(new_img).text(
+            (width / 2.0, 0), label, (0, 0, 0), anchor="mt", font_size=height
+        )
 
         return new_img
 
     @staticmethod
-    def label_image(path: Path, label, padding=20) -> Path:
+    def label_image(path: Path, label, padding=20, color=(255, 255, 255)) -> Path:
         image = Image.open(path)
-        new_img = VideoWriter.create_label(label, image.size[0], image.size[1] + padding)
+        new_img = VideoWriter.create_label(
+            label, image.size[0], image.size[1] + padding, color=color
+        )
         new_img.paste(image, (0, padding))
         return new_img
 
-    def append_file(self, filepath, label=None):
-        if label is not None:
-            path = Path(filepath)
-            new_path = path.with_name(path.stem + "_labelled" + path.suffix).as_posix()
-            padding = 20
-            match path.suffix:
-                case ".png" | ".jpg":
-                    image = Image.open(filepath)
-                    new_img = self.create_label(label, image.size[0], image.size[1] + padding)
-                    new_img.paste(image, (0, padding))
-                    new_img.save(new_path)
-                    self.image_files.append(new_path)
-                case ".webm":
-                    import warnings
-
-                    video_clip = VideoFileClip(filepath)
-                    new_img = self.create_label(label, video_clip.w, padding)
-
-                    # Convert PIL image to MoviePy clip
-                    label_clip = ImageClip(np.array(new_img), duration=video_clip.duration)
-
-                    labeled_video_clip = clips_array([[label_clip], [video_clip]])
-
-                    # otherwise ffmpeg complains that the file is not getting read. We don't need the file just the size
-                    with warnings.catch_warnings():
-                        warnings.simplefilter(action="ignore")
-                        labeled_video_clip.write_videofile(new_path, remove_temp=True, logger=None)
-                    self.video_files.append(new_path)
-        else:
-            self.image_files.append(filepath)
-
-    def to_images_sequence(self, images, target_duration: float = 10.0, frame_time=None, **kwargs):
-        target_duration = kwargs.pop("target_duration", target_duration)
-        if isinstance(images, list) and len(images) > 0:
-            if frame_time is None:
-                fps = len(images) / target_duration
-                fps = max(fps, 1)  # never slower that 1 seconds per frame
-                fps = min(fps, 30)
-            else:
-                fps = 1.0 / frame_time
-            return ImageSequenceClip(images, fps=fps, with_mask=False)
-        return None
-
-    def write_png(self, **kwargs):
-        clip = None
-        if len(self.image_files) > 0:
-            clip = self.to_images_sequence(self.image_files, **kwargs)
-        if len(self.video_files) > 0:
-            clip = concatenate_videoclips([VideoFileClip(f) for f in self.video_files])
-        if clip is not None:
-            clip.write_videofile(self.filename)
-            return self.filename
-        return None
-
     def write_video_raw(self, video_clip: moviepy.video.VideoClip, fps: int = 30) -> str:
         video_clip.write_videofile(
             self.filename,
-            codec="libvpx",
+            codec="libx264",
             audio=False,
             bitrate="0",
             fps=fps,
-            ffmpeg_params=["-crf", "34"],
+            ffmpeg_params=["-crf", "23"],
+            threads=8,
         )
         video_clip.close()
         return self.filename
 
 
-def add_image(np_array: np.ndarray, name: str = "img"):
+def add_image(np_array: np.ndarray, name: str = "img") -> str:
+    """Creates a file on disk from a numpy array and returns the created image path"""
     filename = gen_image_path(name)
     Image.fromarray(np_array).save(filename)
     return filename

{holobench-1.22.2.dist-info → holobench-1.23.0.dist-info}/METADATA

@@ -1,8 +1,10 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.22.2
+Version: 1.23.0
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
+Maintainer: austin.gregg-smith
+Maintainer-email: austin.gregg-smith@dyson.com
 Project-URL: Repository, https://github.com/dyson-ai/bencher
 Project-URL: Home, https://github.com/dyson-ai/bencher
 Project-URL: Documentation, https://bencher.readthedocs.io/en/latest/
@@ -13,7 +15,7 @@ Requires-Dist: numpy <=1.26.4,>=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
-Requires-Dist: panel <=1.4.3,>=1.3.6
+Requires-Dist: panel <=1.4.4,>=1.3.6
 Requires-Dist: diskcache <=5.6.3,>=5.6
 Requires-Dist: optuna <=3.6.1,>=3.2
 Requires-Dist: xarray <=2024.5.0,>=2023.7
@@ -30,9 +32,9 @@ Requires-Dist: black <=24.4.2,>=23 ; extra == 'test'
 Requires-Dist: pylint <=3.2.2,>=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.102.6,>=6.82 ; extra == 'test'
-Requires-Dist: ruff <=0.4.5,>=0.3 ; extra == 'test'
-Requires-Dist: coverage <=7.5.2,>=7.2.7 ; extra == 'test'
+Requires-Dist: hypothesis <=6.103.0,>=6.82 ; extra == 'test'
+Requires-Dist: ruff <=0.4.7,>=0.3 ; extra == 'test'
+Requires-Dist: coverage <=7.5.3,>=7.2.7 ; extra == 'test'
 
 # Bencher
  

holobench-1.23.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+bencher/__init__.py,sha256=XCrJ5Nbw3k1J6j8qVEf6kH5sMmECIXzII-t9SdB8gEI,1558
+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/caching.py,sha256=AusaNrzGGlj5m6zcwcqnTn55Mam2mQdF--oqelO806M,1627
+bencher/class_enum.py,sha256=kYHW9qKkKcNdwaXizZL-fTptS_DUEGv4c88yCehk3gc,1492
+bencher/job.py,sha256=swa0VwrZf41v7qNjreVDIYUU6r_dfuLipPZbg_w5x7c,6089
+bencher/optuna_conversions.py,sha256=an-LfPsQXyyvhIZnG8Wl1RQVYMvJj7WOi3YNqoUnuxQ,5356
+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.22.2.dist-info/RECORD

@@ -1,20 +0,0 @@
-bencher/__init__.py,sha256=G37hQHeemdNYZUaN5BYds5v8AFLzVM1KIAkpUcrk2To,1321
-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=F4DN1YSFXnUAGO17tJ6DZDyEu7QBgvTyqn8G_iCd36c,6165
-bencher/bencher.py,sha256=SmdjwFEdjNkPTVeoG6oXLRM8LOobZLVN90LSAsHCS5E,33299
-bencher/caching.py,sha256=AusaNrzGGlj5m6zcwcqnTn55Mam2mQdF--oqelO806M,1627
-bencher/class_enum.py,sha256=kYHW9qKkKcNdwaXizZL-fTptS_DUEGv4c88yCehk3gc,1492
-bencher/job.py,sha256=swa0VwrZf41v7qNjreVDIYUU6r_dfuLipPZbg_w5x7c,6089
-bencher/optuna_conversions.py,sha256=DAa1DBXJ5EvTGiPyzuDTovQSjKVpMZ2sdwEXThlXJVU,5288
-bencher/utils.py,sha256=MXoJxtpBOf82-iiZBdWBSz6U0AqoUImQK1rXlmwWzF4,6125
-bencher/video_writer.py,sha256=v0yXr7PV0rYWTWqVWBZkXFD3N_ExrZHHHkbEXcXK5bc,4512
-bencher/worker_job.py,sha256=FREi0yWQACFmH86R1j-LH72tALEFkKhLDmmoGQY9Jh4,1571
-holobench-1.22.2.data/data/share/ament_index/resource_index/packages/bencher,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holobench-1.22.2.data/data/share/bencher/package.xml,sha256=HxWM9qIEiLbE60tG0aKsS7q3UaSKDyCMD4-1nYw8vOs,1045
-holobench-1.22.2.dist-info/LICENSE,sha256=dSHXTdRY4Y7qGFMv63UksV700iff7iE-p7GGs6Sbnvo,1065
-holobench-1.22.2.dist-info/METADATA,sha256=MVUNJCVjAdZG72Is39V08gCnGUgqZl9iSpPonIbdIzk,5613
-holobench-1.22.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-holobench-1.22.2.dist-info/top_level.txt,sha256=rkP5-F_W08mOD-25ZPkt0HJsHxedb2EiRcRA7IP6Ceg,8
-holobench-1.22.2.dist-info/RECORD,,