Updated benchmark to include automatic naming

Author: JensBlack

DeepLabStream.py

@@ -17,7 +17,7 @@
 import pandas as pd
 import click
 
-from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MULTI_CAM, STACK_FRAMES,\
+from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MODEL,  MULTI_CAM, STACK_FRAMES, \
     ANIMALS_NUMBER, STREAMS, EXP_NUMBER
 from utils.poser import load_deeplabcut, get_pose, find_local_peaks_new, calculate_skeletons
 from utils.plotter import plot_bodyparts, plot_metadata_frame
@@ -96,6 +96,7 @@ class DeepLabStream:
     """
     Class for managing everything stream-related
     """
+
     def __init__(self):
         """
         Initializing the DeepLabStream class with some predefined variables
@@ -118,7 +119,7 @@ def __init__(self):
         self._fps = 0
         self.greetings()
 
-    @ staticmethod
+    @staticmethod
     def set_camera_manager():
         """
         Trying to load each present camera manager, if installed
@@ -554,7 +555,7 @@ def get_start_time(self):
 # testing part
 @click.command()
 @click.option('--dlc-enabled', 'dlc_enabled', is_flag=True)
-@click.option('--benchmark-enabled', 'benchmark_enabled',  is_flag=True)
+@click.option('--benchmark-enabled', 'benchmark_enabled', is_flag=True)
 @click.option('--recording-enabled', 'recording_enabled', is_flag=True)
 @click.option('--data-output-enabled', 'data_output_enabled', is_flag=True)
 def start_deeplabstream(dlc_enabled, benchmark_enabled, recording_enabled, data_output_enabled):
@@ -704,6 +705,12 @@ def show_benchmark_statistics():
             elif got_first_analysed_frame:
                 print("[{0}/3000] Benchmarking in progress".format(len(analysis_time_data)))
 
+    if benchmark_enabled:
+        import re
+        short_model = re.split('[-_]', MODEL)
+        short_model = short_model[0] + '_' + short_model[2]
+        np.savetxt(f'{OUT_DIR}/{short_model}_framerate_{FRAMERATE}_resolution_{RESOLUTION[0]}_{RESOLUTION[1]}.txt', np.transpose([fps_data, whole_loop_time_data]))
+
 
 if __name__ == '__main__':
     mp.freeze_support()

utils/configloader.py

@@ -33,6 +33,7 @@ def get_script_path():
     print('Incorrect resolution in config!\n'
           'Using default value "RESOLUTION = 848, 480"')
     RESOLUTION = (848, 480)
+MODEL = dsc_config['Streaming'].get('MODEL')
 FRAMERATE = dsc_config['Streaming'].getint('FRAMERATE')
 OUT_DIR = dsc_config['Streaming'].get('OUTPUT_DIRECTORY')
 STREAM = dsc_config['Streaming'].getboolean('STREAM')