fix #111: Use floats for resize

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       # You can use PyPy versions in python-version. For example, pypy2 and pypy3
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/testing.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-11, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"] #3.9 only failing for tables on macos and windows; mwm 6302021
+        python-version: ["3.8", "3.9", "3.10"] #3.9 only failing for tables on macos and windows; mwm 6302021
         include:
           - os: ubuntu-latest
             path: ~/.cache/pip
@@ -42,6 +42,6 @@ jobs:
         shell: bash
       - name: Install and test
         run: |
-          python -m pip install --upgrade pip wheel poetry
-          python -m poetry install
-          python -m poetry run dlc-live-test --nodisplay
+          python -m pip install --upgrade pip
+          python -m pip install .
+          dlc-live-test --nodisplay

README.md

@@ -93,7 +93,7 @@ DeepLabCut-live offers some analysis tools that allow users to peform the follow
 1. Test inference speed across a range of image sizes, downsizing images by specifying the `resize` or `pixels` parameter. Using the `pixels` parameter will resize images to the desired number of `pixels`, without changing the aspect ratio. Results will be saved (along with system info) to a pickle file if you specify an output directory.
 ##### python
 ```python
-dlclive.benchmark_videos('/path/to/exported/model', ['/path/to/video1', '/path/to/video2'], output='/path/to/output', resize=[1.0, 0.75, '0.5'])
+dlclive.benchmark_videos('/path/to/exported/model', ['/path/to/video1', '/path/to/video2'], output='/path/to/output', resize=[1.0, 0.75, 0.5])
 ```
 ##### command line
 ```

dlclive/benchmark.py

@@ -12,7 +12,7 @@
 import sys
 import warnings
 import subprocess
-import typing
+from typing import List, Optional, Tuple, Union
 import pickle
 import colorcet as cc
 from PIL import ImageColor
@@ -151,8 +151,8 @@ def benchmark(
     model_path,
     video_path,
     tf_config=None,
-    resize=None,
-    pixels=None,
+    resize: Optional[float] = None,
+    pixels: Optional[int] = None,
     cropping=None,
     dynamic=(False, 0.5, 10),
     n_frames=1000,
@@ -164,7 +164,7 @@ def benchmark(
     save_poses=False,
     save_video=False,
     output=None,
-) -> typing.Tuple[np.ndarray, tuple, bool, dict]:
+) -> Tuple[np.ndarray, tuple, bool, dict]:
     """ Analyze DeepLabCut-live exported model on a video:
     Calculate inference time,
     display keypoints, or
@@ -521,8 +521,8 @@ def benchmark_videos(
     output=None,
     n_frames=1000,
     tf_config=None,
-    resize=None,
-    pixels=None,
+    resize: Optional[Union[float, List[float]]] = None,
+    pixels: Optional[Union[int, List[int]]] = None,
     cropping=None,
     dynamic=(False, 0.5, 10),
     print_rate=False,
@@ -551,7 +551,7 @@ def benchmark_videos(
         path to directory to save results
     tf_config : :class:`tensorflow.ConfigProto`
         tensorflow session configuration
-    resize : int, optional
+    resize : float, optional
         resize factor. Can only use one of resize or pixels. If both are provided, will use pixels. by default None
     pixels : int, optional
         downsize image to this number of pixels, maintaining aspect ratio. Can only use one of resize or pixels. If both are provided, will use pixels. by default None
@@ -603,10 +603,10 @@ def benchmark_videos(
     # fix resize
 
     if pixels:
-        pixels = pixels if type(pixels) is list else [pixels]
+        pixels = [int(p) for p in pixels] if type(pixels) is list else [int(pixels)]
         resize = [None for p in pixels]
     elif resize:
-        resize = resize if type(resize) is list else [resize]
+        resize = [float(r) for r in resize] if type(resize) is list else [float(resize)]
         pixels = [None for r in resize]
     else:
         resize = [None]