Update inference.py

inference.py

@@ -54,7 +54,6 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
 
     # Load hyperparameters
     if 'model' not in hyperparams: hyperparams['model'] = WEIGHTS
-    if 'conf_thresh' not in hyperparams: hyperparams['conf_thresh'] = CONF_THRES
     if 'iou_thresh' not in hyperparams: hyperparams['iou_thresh'] = NMS_IOU
     if 'min_hits' not in hyperparams: hyperparams['min_hits'] = MIN_HITS
     if 'max_age' not in hyperparams: hyperparams['max_age'] = MAX_AGE
@@ -96,10 +95,10 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
         if 'byte_low_conf' not in hyperparams: hyperparams['byte_low_conf'] = 0.1
         if 'byte_high_conf' not in hyperparams: hyperparams['byte_high_conf'] = 0.3
 
-        low_outputs = do_suppression(inference, conf_thres=hyperparams['low_conf_threshold'], iou_thres=hyperparams['iou_thresh'], gp=gp)
+        low_outputs = do_suppression(inference, conf_thres=hyperparams['byte_low_conf'], iou_thres=hyperparams['iou_thresh'], gp=gp)
         low_preds, real_width, real_height = format_predictions(image_shapes, low_outputs, width, height, gp=gp)
 
-        high_outputs = do_suppression(inference, conf_thres=hyperparams['high_conf_threshold'], iou_thres=hyperparams['iou_thresh'], gp=gp)
+        high_outputs = do_suppression(inference, conf_thres=hyperparams['byte_high_conf'], iou_thres=hyperparams['iou_thresh'], gp=gp)
         high_preds, real_width, real_height = format_predictions(image_shapes, high_outputs, width, height, gp=gp)
 
         results = do_associative_tracking(
@@ -109,7 +108,9 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
             gp=gp)
     else: 
 
-        outputs = do_suppression(inference, conf_thres=hyperparams['conf_threshold'], iou_thres=hyperparams['iou_thresh'], gp=gp)
+        if 'conf_thresh' not in hyperparams: hyperparams['conf_thresh'] = CONF_THRES
+
+        outputs = do_suppression(inference, conf_thres=hyperparams['conf_thresh'], iou_thres=hyperparams['iou_thresh'], gp=gp)
 
         if hyperparams['associative_tracker'] == "Confidence Boost":
             if 'boost_power' not in hyperparams: hyperparams['boost_power'] = 1
@@ -117,7 +118,7 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
 
             do_confidence_boost(inference, outputs, boost_power=hyperparams['boost_power'], boost_decay=hyperparams['boost_decay'], gp=gp)
 
-            outputs = do_suppression(inference, conf_thres=hyperparams['conf_threshold'], iou_thres=hyperparams['iou_thresh'], gp=gp)
+            outputs = do_suppression(inference, conf_thres=hyperparams['conf_thresh'], iou_thres=hyperparams['iou_thresh'], gp=gp)
 
         all_preds, real_width, real_height = format_predictions(image_shapes, outputs, width, height, gp=gp)