merged with newest master

Author: JensBlack

DeepLabStream.py

@@ -17,7 +17,7 @@
 import pandas as pd
 import click
 
-from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MODEL,  MULTI_CAM, STACK_FRAMES, \
+from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MODEL_NAME,  MULTI_CAM, STACK_FRAMES, \
     ANIMALS_NUMBER, STREAMS, STREAMING_SOURCE
 from utils.poser import load_deeplabcut, get_pose, find_local_peaks_new, calculate_skeletons,\
     get_ma_pose, calculate_ma_skeletons, calculate_skeletons_dlc_live
@@ -763,7 +763,7 @@ def show_benchmark_statistics():
 
     if benchmark_enabled:
         import re
-        short_model = re.split('[-_]', MODEL)
+        short_model = re.split('[-_]', MODEL_NAME)
         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]))
 

utils/configloader.py

@@ -30,6 +30,15 @@ def get_script_path():
 # DeepLabCut
 deeplabcut_config = dict(dsc_config.items('DeepLabCut'))
 
+#poseestimation
+MODEL_ORIGIN = dsc_config['Pose Estimation'].get('MODEL_ORIGIN')
+MODEL_PATH = dsc_config['Pose Estimation'].get('MODEL_PATH')
+MODEL_NAME = dsc_config['Pose Estimation'].get('MODEL_NAME')
+ALL_BODYPARTS = tuple(part for part in dsc_config['Pose Estimation'].get('ALL_BODYPARTS').split(','))
+
+
+
+
 # Streaming items
 try:
     RESOLUTION = tuple(int(part) for part in dsc_config['Streaming'].get('RESOLUTION').split(','))

utils/poser.py

@@ -20,19 +20,20 @@
 
 
 # trying importing functions using deeplabcut module, if DLC 2 is installed correctly
-try:
-    import deeplabcut.pose_estimation_tensorflow.nnet.predict as predict
-    from deeplabcut.pose_estimation_tensorflow.config import load_config
-    from deeplabcut.pose_estimation_tensorflow.nnet import predict_multianimal
-
-    models_folder = 'pose_estimation_tensorflow/models/'
-# if not DLC 2 is not installed, try import from DLC 1 the old way
-except ImportError:
-    # adding DLC posing path and loading modules from it
-    sys.path.insert(0,MODEL_PATH + "/pose-tensorflow")
-    from config import load_config
-    from nnet import predict
-    models_folder = 'pose-tensorflow/models/'
+if MODEL_ORIGIN == 'DLC' or MODEL_ORIGIN == 'DLC-LIVE' or MODEL_ORIGIN == 'MADLC':
+    try:
+        import deeplabcut.pose_estimation_tensorflow.nnet.predict as predict
+        from deeplabcut.pose_estimation_tensorflow.config import load_config
+        from deeplabcut.pose_estimation_tensorflow.nnet import predict_multianimal
+
+        models_folder = 'pose_estimation_tensorflow/models/'
+    # if not DLC 2 is not installed, try import from DLC 1 the old way
+    except ImportError:
+        # adding DLC posing path and loading modules from it
+        sys.path.insert(0,MODEL_PATH + "/pose-tensorflow")
+        from config import load_config
+        from nnet import predict
+        models_folder = 'pose-tensorflow/models/'
 
 
 def load_deeplabcut():