holobench 1.3.0__tar.gz → 1.3.2__tar.gz

{holobench-1.3.0 → holobench-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.3.0
+Version: 1.3.2
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Requires-Python: >=3.10
@@ -10,7 +10,7 @@ Requires-Dist: numpy>=1.0,<=1.26.2
 Requires-Dist: param>=1.13.0,<=2.0.1
 Requires-Dist: hvplot>=0.8,<=0.9.1
 Requires-Dist: matplotlib>=3.6.3,<=3.8.2
-Requires-Dist: panel>=1.2.3,<1.4
+Requires-Dist: panel>=1.3.6,<=1.3.6
 Requires-Dist: diskcache>=5.6,<=5.6.3
 Requires-Dist: optuna>=3.2,<=3.5.0
 Requires-Dist: xarray>=2023.7,<=2023.12.0
@@ -22,6 +22,7 @@ Requires-Dist: scikit-learn>=1.2,<=1.3.2
 Requires-Dist: str2bool>=1.1,<=1.1
 Requires-Dist: scoop>=0.7.0,<=0.7.2.0
 Requires-Dist: ffmpeg-downloader>=0.3.0,<=0.3.0
+Requires-Dist: moviepy>=1.0.3,<=1.0.3
 Requires-Dist: black>=23,<=23.12.1 ; extra == "test"
 Requires-Dist: pylint>=2.16,<=3.0.3 ; extra == "test"
 Requires-Dist: pytest-cov>=4.1,<=4.1 ; extra == "test"

{holobench-1.3.0 → holobench-1.3.2}/bencher/__init__.py

@@ -18,7 +18,14 @@ from .variables.results import (
     curve,
 )
 from .plotting.plot_filter import VarRange, PlotFilter
-from .utils import hmap_canonical_input, get_nearest_coords, make_namedtuple
+from .utils import (
+    hmap_canonical_input,
+    get_nearest_coords,
+    make_namedtuple,
+    gen_path,
+    gen_image_path,
+    gen_video_path,
+)
 from .variables.parametrised_sweep import ParametrizedSweep
 from .caching import CachedParams
 from .results.bench_result import BenchResult
@@ -26,3 +33,4 @@ from .results.panel_result import PanelResult
 from .results.holoview_result import ReduceType, HoloviewResult
 from .bench_report import BenchReport
 from .job import Executors
+from .video_writer import VideoWriter

{holobench-1.3.0 → holobench-1.3.2}/bencher/bencher.py

@@ -228,7 +228,7 @@ class Bench(BenchPlotServer):
                 )
                 input_vars = self.worker_class_instance.get_inputs_only()
                 for i in input_vars:
-                    logging.info(i.name)
+                    logging.info(f"input var: {i.name}")
             if result_vars is None:
                 logging.info(
                     "No results variables passed, using all result variables in bench class:"

{holobench-1.3.0 → holobench-1.3.2}/bencher/example/example_image.py

@@ -25,7 +25,7 @@ class BenchPolygons(bch.ParametrizedSweep):
         self.update_params_from_kwargs(**kwargs)
         points = polygon_points(self.radius, self.sides)
         self.hmap = hv.Curve(points)
-        self.polygon = self.points_to_polygon_png(points, self.gen_image_path("polygon"))
+        self.polygon = self.points_to_polygon_png(points, bch.gen_image_path("polygon"))
         return super().__call__()
 
     def points_to_polygon_png(self, points: list[float], filename: str):

{holobench-1.3.0 → holobench-1.3.2}/bencher/example/example_video.py

@@ -66,7 +66,7 @@ class TuringPattern(bch.ParametrizedSweep):
                 artists.append([ax.imshow(U)])
 
         ani = ArtistAnimation(fig=fig, artists=artists, interval=60, blit=True)
-        path = self.gen_path("turing", "vid", ".mp4")
+        path = bch.gen_video_path("turing", ".mp4")
         # path = self.gen_path("turing", "vid", ".gif")
         print(f"saving {len(artists)} frames")
         ani.save(path)

{holobench-1.3.0 → holobench-1.3.2}/bencher/results/bench_result_base.py

@@ -12,6 +12,7 @@ from bencher.variables.results import OptDir
 from copy import deepcopy
 from bencher.results.optuna_result import OptunaResult
 from bencher.variables.results import ResultVar
+from bencher.results.float_formatter import FormatFloat
 import panel as pn
 
 
@@ -293,12 +294,19 @@ class BenchResultBase(OptunaResult):
 
             container_args = {"name": name, "styles": {"background": background_col}}
             outer_container = (
-                pn.Row(**container_args) if horizontal else pn.Column(**container_args, align="end")
+                pn.Row(**container_args) if horizontal else pn.Column(**container_args)
             )
 
+            max_len = 0
+
             for i in range(dataset.sizes[dim_sel]):
                 sliced = dataset.isel({dim_sel: i})
-                label = f"{dim_sel}={sliced.coords[dim_sel].values}"
+
+                lable_val = sliced.coords[dim_sel].values.item()
+                if isinstance(lable_val, (int, float)):
+                    lable_val = FormatFloat()(lable_val)
+
+                label = f"{dim_sel}={lable_val}"
 
                 panes = self._to_panes_da(
                     sliced,
@@ -321,12 +329,17 @@ class BenchResultBase(OptunaResult):
                     inner_container = pn.Row(**container_args)
                     align = ("end", "center")
 
-                side = pn.pane.Markdown(f"{label}", align=align)
+                label_len = len(label)
+                if label_len > max_len:
+                    max_len = label_len
+                side = pn.pane.Markdown(label, align=align)
 
                 inner_container.append(side)
                 inner_container.append(panes)
                 outer_container.append(inner_container)
                 # outer_container.append(pn.Row(inner_container, align="center"))
+            for c in outer_container:
+                c[0].width = max_len * 7
         else:
             return plot_callback(dataset=dataset, result_var=result_var, **kwargs)
 

holobench-1.3.2/bencher/results/float_formatter.py

@@ -0,0 +1,44 @@
+# from https://stackoverflow.com/questions/22989372/how-to-format-a-floating-number-to-maximum-fixed-width-in-python
+
+
+class FormatFloat:
+    def __init__(self, width=8):
+        self.width = width
+        self.maxnum = int("9" * (width - 1))  # 9999999
+        self.minnum = -int("9" * (width - 2))  # -999999
+
+    def __call__(self, x):
+        # for small numbers
+        # if -999,999 < given < 9,999,999:
+        if self.minnum < x < self.maxnum:
+            # o = f'{x:7}'
+            o = f"{x:{self.width - 1}}"
+
+            # converting int to float without adding zero
+            if "." not in o:
+                o += "."
+
+            # float longer than 8 will need rounding to fit width
+            elif len(o) > self.width:
+                # output = str(round(x, 7 - str(x).index(".")))
+                o = str(round(x, self.width - 1 - str(x).index(".")))
+                if len(o) < self.width:
+                    o += (self.width - len(o)) * "0"
+
+        else:
+            # for exponents
+            # added a loop for super large numbers or negative as "-" is another char
+            # Added max(max_char, 5) to account for max length of less
+            #     than 5, was having too much fun
+            # TODO can i come up with a threshold value for these up front,
+            #     so that i dont have to do this calc for every value??
+            for n in range(max(self.width, 5) - 5, 0, -1):
+                fill = f".{n}e"
+                o = f"{x:{fill}}".replace("+0", "+")
+
+                # if all good stop looping
+                if len(o) == self.width:
+                    break
+            else:
+                raise ValueError(f"Number is too large to fit in {self.width} characters", x)
+        return o

{holobench-1.3.0 → holobench-1.3.2}/bencher/results/holoview_result.py

@@ -388,7 +388,6 @@ class HoloviewResult(PanelResult):
         return htmap + tap_htmap
 
     def to_nd_layout(self, hmap_name: str) -> hv.NdLayout:
-        print(self.bench_cfg.hmap_kdims)
         return hv.NdLayout(self.get_hmap(hmap_name), kdims=self.bench_cfg.hmap_kdims).opts(
             shared_axes=False, shared_datasource=False
         )

{holobench-1.3.0 → holobench-1.3.2}/bencher/results/panel_result.py

@@ -1,4 +1,5 @@
 from typing import Optional, Any
+from pathlib import Path
 from functools import partial
 import panel as pn
 import xarray as xr
@@ -23,10 +24,12 @@ class PanelResult(BenchResultBase):
             xr_dataset = self.to_hv_dataset(ReduceType.SQUEEZE)
 
             def to_video_da(da, **kwargs):
-                vid = pn.pane.Video(da, autoplay=True, **kwargs)
-                vid.loop = True
-                vid_p.append(vid)
-                return vid
+                if da is not None and Path(da).exists():
+                    vid = pn.pane.Video(da, autoplay=True, **kwargs)
+                    vid.loop = True
+                    vid_p.append(vid)
+                    return vid
+                return pn.pane.Markdown(f"video does not exist {da}")
 
             plot_callback = partial(self.ds_to_container, container=partial(to_video_da, **kwargs))
 

{holobench-1.3.0 → holobench-1.3.2}/bencher/utils.py

@@ -5,6 +5,8 @@ import hashlib
 import re
 import math
 from colorsys import hsv_to_rgb
+from pathlib import Path
+from uuid import uuid4
 
 
 def hmap_canonical_input(dic: dict) -> tuple:
@@ -106,3 +108,17 @@ def int_to_col(int_val, sat=0.5, val=0.95, alpha=-1) -> tuple[float, float, floa
 
 def color_tuple_to_css(color: tuple[float, float, float]) -> str:
     return f"rgb{(color[0] * 255, color[1] * 255, color[2] * 255)}"
+
+
+def gen_path(filename, folder, suffix):
+    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, extension: str = ".webm") -> str:
+    return gen_path(video_name, "vid", extension)
+
+
+def gen_image_path(image_name: str, filetype=".png") -> str:
+    return gen_path(image_name, "img", filetype)

{holobench-1.3.0 → holobench-1.3.2}/bencher/variables/inputs.py

@@ -185,3 +185,9 @@ class FloatSweep(Number, SweepBase):
             ]
             return [self.sample_values[i] for i in indices]
         return self.sample_values
+
+
+def box(name, center, width):
+    var = FloatSweep(default=center, bounds=(center - width, center + width))
+    var.name = name
+    return var

{holobench-1.3.0 → holobench-1.3.2}/bencher/variables/parametrised_sweep.py

@@ -3,7 +3,7 @@ from typing import List, Tuple, Any
 from param import Parameter, Parameterized
 import holoviews as hv
 import panel as pn
-from pathlib import Path
+
 
 from bencher.utils import make_namedtuple, hash_sha1
 from bencher.variables.results import (
@@ -17,8 +17,6 @@ from bencher.variables.results import (
     ResultReference,
 )
 
-from uuid import uuid4
-
 
 class ParametrizedSweep(Parameterized):
     """Parent class for all Sweep types that need a custom hash"""
@@ -197,23 +195,12 @@ class ParametrizedSweep(Parameterized):
     def plot_hmap(self, **kwargs):
         return self.__call__(**kwargs)["hmap"]
 
-    def gen_path(self, filename, folder, suffix):
-        path = Path(f"cachedir/{folder}") / Path(filename)
-        path.mkdir(parents=True, exist_ok=True)
-        return f"{path.absolute().as_posix()}_{uuid4()}{suffix}"
-
-    def gen_video_path(self, video_name: str) -> str:
-        return self.gen_path(video_name, "vid", ".webm")
-
-    def gen_image_path(self, image_name: str, filetype=".png") -> str:
-        return self.gen_path(image_name, "img", filetype)
-
     def to_bench(self, run_cfg=None, report=None, name: str = None):
         from bencher import Bench
 
         assert isinstance(self, ParametrizedSweep)
 
         if name is None:
-            name = self.name
+            name = self.name[:-5]  # param adds 5 digit number to the end, so remove it
 
         return Bench(name, self, run_cfg=run_cfg, report=report)

holobench-1.3.2/bencher/video_writer.py

@@ -0,0 +1,17 @@
+from bencher import gen_video_path
+
+
+class VideoWriter:
+    def __init__(self, filename: str) -> None:
+        self.images = []
+        self.filename = gen_video_path(filename)
+
+    def append(self, img):
+        self.images.append(img)
+
+    def write(self, bitrate: int = 1500) -> str:
+        import moviepy.video.io.ImageSequenceClip
+
+        clip = moviepy.video.io.ImageSequenceClip.ImageSequenceClip(self.images, fps=30)
+        clip.write_videofile(self.filename, bitrate=f"{bitrate}k")
+        return self.filename

{holobench-1.3.0 → holobench-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "holobench"
-version = "1.3.0"
+version = "1.3.2"
 
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "A package for benchmarking the performance of arbitrary functions"
@@ -15,7 +15,7 @@ dependencies = [
   "param>=1.13.0,<=2.0.1",
   "hvplot>=0.8,<=0.9.1",
   "matplotlib>=3.6.3,<=3.8.2",
-  "panel>=1.2.3,<1.4",
+  "panel>=1.3.6,<=1.3.6",
   "diskcache>=5.6,<=5.6.3",
   "optuna>=3.2,<=3.5.0",
   "xarray>=2023.7,<=2023.12.0",
@@ -27,6 +27,7 @@ dependencies = [
   "str2bool>=1.1,<=1.1",
   "scoop>=0.7.0,<=0.7.2.0",
   "ffmpeg-downloader>=0.3.0,<=0.3.0",
+  "moviepy>=1.0.3,<=1.0.3",
 ]
 
 [project.optional-dependencies]