From 971c4a37aa4e77346eaf0ab80adf3972f430bec1 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 15 Apr 2024 11:06:20 +0900 Subject: [PATCH] fix: SegmDetectorCombined, BboxDetectorCombined - return empty mask instead of None --- modules/impact/config.py | 2 +- modules/impact/detectors.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/impact/config.py b/modules/impact/config.py index 4c4a238..ff1b441 100644 --- a/modules/impact/config.py +++ b/modules/impact/config.py @@ -2,7 +2,7 @@ import configparser import os -version_code = [4, 87, 5] +version_code = [4, 87, 6] version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') dependency_version = 20 diff --git a/modules/impact/detectors.py b/modules/impact/detectors.py index cc289ba..4b120d7 100644 --- a/modules/impact/detectors.py +++ b/modules/impact/detectors.py @@ -151,6 +151,10 @@ class SegmDetectorCombined: def doit(self, segm_detector, image, threshold, dilation): mask = segm_detector.detect_combined(image, threshold, dilation) + + if mask is None: + mask = torch.zeros((image.shape[2], image.shape[1]), dtype=torch.float32, device="cpu") + return (mask.unsqueeze(0),) @@ -167,6 +171,10 @@ class BboxDetectorCombined(SegmDetectorCombined): def doit(self, bbox_detector, image, threshold, dilation): mask = bbox_detector.detect_combined(image, threshold, dilation) + + if mask is None: + mask = torch.zeros((image.shape[2], image.shape[1]), dtype=torch.float32, device="cpu") + return (mask.unsqueeze(0),)