2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made NMS configurable

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2019-09-13 11:41:39 +02:00
parent 343d832545
commit 3d78309603
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/twomartens/masterthesis/ssd.py
View File

@ -424,7 +424,8 @@ def _apply_entropy_filtering(observations: Sequence[np.ndarray],
entropy_threshold: float, entropy_threshold: float,
confidence_threshold: float, confidence_threshold: float,
iou_threshold: float, iou_threshold: float,
nr_classes: int) -> List[np.ndarray]: nr_classes: int,
use_nms: bool = True) -> List[np.ndarray]:
final_observations = [] final_observations = []
batch_size = len(observations) batch_size = len(observations)
for i in range(batch_size): for i in range(batch_size):
@ -438,10 +439,13 @@ def _apply_entropy_filtering(observations: Sequence[np.ndarray],
single_class = filtered_image_observations[:, [class_id, -5, -4, -3, -2]] single_class = filtered_image_observations[:, [class_id, -5, -4, -3, -2]]
threshold_met = single_class[single_class[:, 0] > confidence_threshold] threshold_met = single_class[single_class[:, 0] > confidence_threshold]
if threshold_met.shape[0] > 0: if threshold_met.shape[0] > 0:
if use_nms:
maxima = ssd_output_decoder._greedy_nms(threshold_met, iou_threshold=iou_threshold) maxima = ssd_output_decoder._greedy_nms(threshold_met, iou_threshold=iou_threshold)
maxima_output = np.zeros((maxima.shape[0], maxima.shape[1] + 1)) maxima_output = np.zeros((maxima.shape[0], maxima.shape[1] + 1))
else:
maxima_output = np.zeros((threshold_met.shape[0], threshold_met.shape[1] + 1))
maxima_output[:, 0] = class_id maxima_output[:, 0] = class_id
maxima_output[:, 1:] = maxima maxima_output[:, 1:] = maxima if use_nms else threshold_met
final_image_observations.append(maxima_output) final_image_observations.append(maxima_output)
if final_image_observations: if final_image_observations:
final_image_observations = np.concatenate(final_image_observations, axis=0) final_image_observations = np.concatenate(final_image_observations, axis=0)