v0.0b2; fixed reading of modeltype

Author: AlexEMG

benchmarking/run.py

@@ -6,8 +6,9 @@
 from dlclive import benchmark_model_by_size
 
 # Update the datafolder to where the data is:
-datafolder='/media/alex/dropboxdisk/DLC-LiveBenchmarking/DLC-live-benchmarkingdata'
-
+datafolder=PUTFOLDER_TO_data!
+n_frames = 1000 #change to 10000 for testing on a GPU!
+pixels = [2500, 10000, 40000, 160000, 320000, 640000]
 
 dog_models = glob.glob(datafolder + '/dog/*[!avi]')
 dog_video = glob.glob(datafolder + '/dog/*.avi')[0]
@@ -18,10 +19,6 @@
 #storing results in /benchmarking/results: (for your PR)
 out_dir = os.path.normpath(this_dir + '/results')
 
-n_frames = 1000 #change to 10000 for GPU!
-pixels = [2500, 10000, 40000, 160000, 320000, 640000]
-ind = 1
-
 for ind_m, m in enumerate(dog_models):
     print("\n\nMODEL {:d} / 8".format(ind_m))
     benchmark_model_by_size(m, dog_video, ind_m, out_dir=out_dir, n_frames=n_frames, pixels=pixels)

dlclive/bench.py

@@ -177,9 +177,7 @@ def run_benchmark(model_path, video_path, resize=None, pixels=None, n_frames=100
 def get_savebenchmarkfn(sys_info ,i, fn_ind, out_dir=None):
     ''' get filename to save data (definitions see save_benchmark)'''
     out_dir = out_dir if out_dir is not None else os.getcwd()
-    host_name, op_sys, host_python, dev = sys_info
-
-    base_name = "benchmark_{}_{}_{}_{}.pickle".format(host_name, sys_info['device_type'], fn_ind, i)
+    base_name = "benchmark_{}_{}_{}_{}.pickle".format(sys_info['host_name'], sys_info['device_type'], fn_ind, i)
     datafilename = out_dir + '/' + base_name
     return datafilename
 
@@ -214,9 +212,6 @@ def save_benchmark(sys_info, inf_times, pixels, i, fn_ind, TFGPUinference, model
         #out_dir = out_dir if out_dir is not None else os.getcwd()
         datafilename=get_savebenchmarkfn(sys_info ,iter, fn_ind, out_dir=out_dir)
 
-    host_name, op_sys, host_python, dev = sys_info
-    host_name = host_name.replace(" ", "")
-
     model_type = None
     if model is not None:
         if 'resnet' in model:
@@ -231,7 +226,7 @@ def save_benchmark(sys_info, inf_times, pixels, i, fn_ind, TFGPUinference, model
             'TFGPUinference' : TFGPUinference,
             'pixels' : pixels,
             'inference_times' : inf_times}
-            
+
     data.update(sys_info)
 
     pickle.dump(data, open(os.path.normpath(datafilename), 'wb'))

dlclive/version.py

@@ -8,5 +8,5 @@
 """
 
 
-__version__ = '0.0.b1'
+__version__ = '0.0.b2'
 VERSION = __version__

reinstall.sh

@@ -1,3 +1,3 @@
 pip uninstall deeplabcut-live
 python3 setup.py sdist bdist_wheel
-pip install dist/deeplabcut_live-0.0b1-py3-none-any.whl
+pip install dist/deeplabcut_live-0.0b2-py3-none-any.whl

setup.py

@@ -25,7 +25,7 @@
 
 setuptools.setup(
     name="deeplabcut-live",
-    version="0.0.b1",
+    version="0.0.b2",
     author="A. & M. Mathis Labs",
     author_email="[email protected]",
     description="Class to load exported DeepLabCut networks and perform pose estimation on single frames (from a camera feed)",