From 8543f4bbd1456d7d28a89cefacb0bdb6ab0ed8fd Mon Sep 17 00:00:00 2001 From: jkbmrz <74824974+jkbmrz@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:30:10 +0100 Subject: [PATCH] fix: within-library imports and SegmentationMasksSAM reference (#165) * remove SegmentationMasksSAM message reference * change within-library imports from relative to absolute --------- Co-authored-by: klemen1999 --- depthai_nodes/ml/helpers/tiles_patcher.py | 4 ++-- depthai_nodes/ml/helpers/tiling.py | 2 +- depthai_nodes/ml/messages/README.md | 10 ---------- .../ml/messages/creators/classification.py | 2 +- depthai_nodes/ml/messages/creators/clusters.py | 2 +- depthai_nodes/ml/messages/creators/detection.py | 4 ++-- depthai_nodes/ml/messages/creators/keypoints.py | 2 +- depthai_nodes/ml/messages/creators/map.py | 2 +- depthai_nodes/ml/messages/creators/regression.py | 2 +- depthai_nodes/ml/messages/creators/segmentation.py | 2 +- depthai_nodes/ml/messages/img_detections.py | 5 ++--- depthai_nodes/ml/parsers/classification.py | 6 +++--- .../ml/parsers/classification_sequence.py | 6 +++--- depthai_nodes/ml/parsers/detection.py | 2 +- depthai_nodes/ml/parsers/embeddings.py | 2 +- depthai_nodes/ml/parsers/fastsam.py | 7 ++++--- depthai_nodes/ml/parsers/hrnet.py | 4 ++-- depthai_nodes/ml/parsers/image_output.py | 6 +++--- depthai_nodes/ml/parsers/keypoints.py | 4 ++-- depthai_nodes/ml/parsers/lane_detection.py | 6 +++--- depthai_nodes/ml/parsers/map_output.py | 4 ++-- .../ml/parsers/mediapipe_palm_detection.py | 6 +++--- depthai_nodes/ml/parsers/mlsd.py | 6 +++--- depthai_nodes/ml/parsers/ppdet.py | 6 +++--- depthai_nodes/ml/parsers/regression.py | 4 ++-- depthai_nodes/ml/parsers/scrfd.py | 8 ++++---- depthai_nodes/ml/parsers/segmentation.py | 4 ++-- depthai_nodes/ml/parsers/superanimal_landmarker.py | 6 +++--- depthai_nodes/ml/parsers/utils/fastsam.py | 6 +++++- depthai_nodes/ml/parsers/utils/keypoints.py | 2 +- depthai_nodes/ml/parsers/utils/ppdet.py | 4 +++- depthai_nodes/ml/parsers/utils/scrfd.py | 2 +- depthai_nodes/ml/parsers/utils/ufld.py | 2 +- depthai_nodes/ml/parsers/utils/yolo.py | 6 +++--- depthai_nodes/ml/parsers/utils/yunet.py | 4 ++-- depthai_nodes/ml/parsers/xfeat.py | 6 +++--- depthai_nodes/ml/parsers/yolo.py | 13 ++++++++----- depthai_nodes/ml/parsers/yunet.py | 14 +++++++++----- depthai_nodes/parser_generator.py | 6 +++--- depthai_nodes/parsing_neural_network.py | 4 ++-- 40 files changed, 98 insertions(+), 95 deletions(-) diff --git a/depthai_nodes/ml/helpers/tiles_patcher.py b/depthai_nodes/ml/helpers/tiles_patcher.py index 8fbc222a..4ca8f315 100644 --- a/depthai_nodes/ml/helpers/tiles_patcher.py +++ b/depthai_nodes/ml/helpers/tiles_patcher.py @@ -2,8 +2,8 @@ import depthai as dai -from .tiling import Tiling -from .utils.nms import nms_detections +from depthai_nodes.ml.helpers.tiling import Tiling +from depthai_nodes.ml.helpers.utils.nms import nms_detections class TilesPatcher(dai.node.HostNode): diff --git a/depthai_nodes/ml/helpers/tiling.py b/depthai_nodes/ml/helpers/tiling.py index b964976d..ae883dc0 100644 --- a/depthai_nodes/ml/helpers/tiling.py +++ b/depthai_nodes/ml/helpers/tiling.py @@ -4,7 +4,7 @@ import depthai as dai import numpy as np -from .utils.to_planar import to_planar +from depthai_nodes.ml.helpers.utils.to_planar import to_planar class Tiling(dai.node.HostNode): diff --git a/depthai_nodes/ml/messages/README.md b/depthai_nodes/ml/messages/README.md index 34de76f5..255a685f 100644 --- a/depthai_nodes/ml/messages/README.md +++ b/depthai_nodes/ml/messages/README.md @@ -31,8 +31,6 @@ Here are the custom message types that we introduce in this package. They are us - [Attributes](#attributes-11) - [SegmentationMask](#segmentationmask) - [Attributes](#attributes-12) - - [SegmentationMasksSAM](#segmentationmaskssam) - - [Attributes](#attributes-13) ## Classifications @@ -150,11 +148,3 @@ SegmentationMask class for a single- or multi-object segmentation mask. Backgrou ### Attributes - **mask** (NDArray\[np.int16\]): Segmentation mask. - -## SegmentationMasksSAM - -SegmentationMasksSAM class for storing segmentation masks. - -### Attributes - -- **masks** (np.ndarray): Mask coefficients. diff --git a/depthai_nodes/ml/messages/creators/classification.py b/depthai_nodes/ml/messages/creators/classification.py index 1cf0285a..b8b7808e 100644 --- a/depthai_nodes/ml/messages/creators/classification.py +++ b/depthai_nodes/ml/messages/creators/classification.py @@ -2,7 +2,7 @@ import numpy as np -from ...messages import Classifications +from depthai_nodes.ml.messages import Classifications def create_classification_message( diff --git a/depthai_nodes/ml/messages/creators/clusters.py b/depthai_nodes/ml/messages/creators/clusters.py index 8f2e4696..45697cdf 100644 --- a/depthai_nodes/ml/messages/creators/clusters.py +++ b/depthai_nodes/ml/messages/creators/clusters.py @@ -2,7 +2,7 @@ import depthai as dai -from ...messages import Cluster, Clusters +from depthai_nodes.ml.messages import Cluster, Clusters def create_cluster_message(clusters: List[List[List[Union[float, int]]]]) -> Clusters: diff --git a/depthai_nodes/ml/messages/creators/detection.py b/depthai_nodes/ml/messages/creators/detection.py index 06acd7b2..9bff77cc 100644 --- a/depthai_nodes/ml/messages/creators/detection.py +++ b/depthai_nodes/ml/messages/creators/detection.py @@ -1,13 +1,13 @@ import depthai as dai import numpy as np -from ...messages import ( +from depthai_nodes.ml.messages import ( ImgDetectionExtended, ImgDetectionsExtended, Line, Lines, ) -from ...parsers.utils import transform_to_keypoints +from depthai_nodes.ml.parsers.utils import transform_to_keypoints def create_detection_message( diff --git a/depthai_nodes/ml/messages/creators/keypoints.py b/depthai_nodes/ml/messages/creators/keypoints.py index cd5fe860..618ea51e 100644 --- a/depthai_nodes/ml/messages/creators/keypoints.py +++ b/depthai_nodes/ml/messages/creators/keypoints.py @@ -2,7 +2,7 @@ import numpy as np -from ...messages import Keypoint, Keypoints +from depthai_nodes.ml.messages import Keypoint, Keypoints def create_keypoints_message( diff --git a/depthai_nodes/ml/messages/creators/map.py b/depthai_nodes/ml/messages/creators/map.py index de3eccc3..8f3ac0c3 100644 --- a/depthai_nodes/ml/messages/creators/map.py +++ b/depthai_nodes/ml/messages/creators/map.py @@ -1,6 +1,6 @@ import numpy as np -from ...messages import Map2D +from depthai_nodes.ml.messages import Map2D def create_map_message(map: np.ndarray, min_max_scaling: bool = False) -> Map2D: diff --git a/depthai_nodes/ml/messages/creators/regression.py b/depthai_nodes/ml/messages/creators/regression.py index c55eb4a7..a08d3ba3 100644 --- a/depthai_nodes/ml/messages/creators/regression.py +++ b/depthai_nodes/ml/messages/creators/regression.py @@ -1,6 +1,6 @@ from typing import List -from ...messages import Prediction, Predictions +from depthai_nodes.ml.messages import Prediction, Predictions def create_regression_message(predictions: List[float]) -> Predictions: diff --git a/depthai_nodes/ml/messages/creators/segmentation.py b/depthai_nodes/ml/messages/creators/segmentation.py index 97629b12..bd66df5f 100644 --- a/depthai_nodes/ml/messages/creators/segmentation.py +++ b/depthai_nodes/ml/messages/creators/segmentation.py @@ -1,6 +1,6 @@ import numpy as np -from ...messages import SegmentationMask +from depthai_nodes.ml.messages import SegmentationMask def create_segmentation_message(mask: np.ndarray) -> SegmentationMask: diff --git a/depthai_nodes/ml/messages/img_detections.py b/depthai_nodes/ml/messages/img_detections.py index 9db1b4a8..20efb4b5 100644 --- a/depthai_nodes/ml/messages/img_detections.py +++ b/depthai_nodes/ml/messages/img_detections.py @@ -10,9 +10,8 @@ OUTLINE_COLOR, TEXT_COLOR, ) - -from .keypoints import Keypoint -from .segmentation import SegmentationMask +from depthai_nodes.ml.messages.keypoints import Keypoint +from depthai_nodes.ml.messages.segmentation import SegmentationMask class ImgDetectionExtended(dai.Buffer): diff --git a/depthai_nodes/ml/parsers/classification.py b/depthai_nodes/ml/parsers/classification.py index 66221402..d90d6df1 100644 --- a/depthai_nodes/ml/parsers/classification.py +++ b/depthai_nodes/ml/parsers/classification.py @@ -3,11 +3,11 @@ import depthai as dai import numpy as np -from ..messages.creators import ( +from depthai_nodes.ml.messages.creators import ( create_classification_message, ) -from .base_parser import BaseParser -from .utils.softmax import softmax +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.softmax import softmax class ClassificationParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/classification_sequence.py b/depthai_nodes/ml/parsers/classification_sequence.py index cdf3d4fe..94d22dba 100644 --- a/depthai_nodes/ml/parsers/classification_sequence.py +++ b/depthai_nodes/ml/parsers/classification_sequence.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_classification_sequence_message -from .classification import ClassificationParser -from .utils.softmax import softmax +from depthai_nodes.ml.messages.creators import create_classification_sequence_message +from depthai_nodes.ml.parsers.classification import ClassificationParser +from depthai_nodes.ml.parsers.utils.softmax import softmax class ClassificationSequenceParser(ClassificationParser): diff --git a/depthai_nodes/ml/parsers/detection.py b/depthai_nodes/ml/parsers/detection.py index 715d375b..be2f601c 100644 --- a/depthai_nodes/ml/parsers/detection.py +++ b/depthai_nodes/ml/parsers/detection.py @@ -1,4 +1,4 @@ -from .base_parser import BaseParser +from depthai_nodes.ml.parsers.base_parser import BaseParser class DetectionParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/embeddings.py b/depthai_nodes/ml/parsers/embeddings.py index 53a8b211..7115adb0 100644 --- a/depthai_nodes/ml/parsers/embeddings.py +++ b/depthai_nodes/ml/parsers/embeddings.py @@ -2,7 +2,7 @@ import depthai as dai -from .base_parser import BaseParser +from depthai_nodes.ml.parsers.base_parser import BaseParser class EmbeddingsParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/fastsam.py b/depthai_nodes/ml/parsers/fastsam.py index 1b7bab0c..ac12b0ad 100644 --- a/depthai_nodes/ml/parsers/fastsam.py +++ b/depthai_nodes/ml/parsers/fastsam.py @@ -3,15 +3,16 @@ import depthai as dai import numpy as np -from ..messages.creators import create_segmentation_message -from .base_parser import BaseParser -from .utils.fastsam import ( +from depthai_nodes.ml.messages.creators import create_segmentation_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.fastsam import ( box_prompt, decode_fastsam_output, merge_masks, point_prompt, process_single_mask, ) + from .utils.masks_utils import get_segmentation_outputs diff --git a/depthai_nodes/ml/parsers/hrnet.py b/depthai_nodes/ml/parsers/hrnet.py index dfc53e74..b621b0d1 100644 --- a/depthai_nodes/ml/parsers/hrnet.py +++ b/depthai_nodes/ml/parsers/hrnet.py @@ -3,8 +3,8 @@ import depthai as dai import numpy as np -from ..messages.creators import create_keypoints_message -from .keypoints import KeypointParser +from depthai_nodes.ml.messages.creators import create_keypoints_message +from depthai_nodes.ml.parsers.keypoints import KeypointParser class HRNetParser(KeypointParser): diff --git a/depthai_nodes/ml/parsers/image_output.py b/depthai_nodes/ml/parsers/image_output.py index 80086ac9..319d015b 100644 --- a/depthai_nodes/ml/parsers/image_output.py +++ b/depthai_nodes/ml/parsers/image_output.py @@ -2,9 +2,9 @@ import depthai as dai -from ..messages.creators import create_image_message -from .base_parser import BaseParser -from .utils import unnormalize_image +from depthai_nodes.ml.messages.creators import create_image_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils import unnormalize_image class ImageOutputParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/keypoints.py b/depthai_nodes/ml/parsers/keypoints.py index 254a96ba..53df75ab 100644 --- a/depthai_nodes/ml/parsers/keypoints.py +++ b/depthai_nodes/ml/parsers/keypoints.py @@ -3,8 +3,8 @@ import depthai as dai import numpy as np -from ..messages.creators import create_keypoints_message -from .base_parser import BaseParser +from depthai_nodes.ml.messages.creators import create_keypoints_message +from depthai_nodes.ml.parsers.base_parser import BaseParser class KeypointParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/lane_detection.py b/depthai_nodes/ml/parsers/lane_detection.py index 7faa5364..33eb877d 100644 --- a/depthai_nodes/ml/parsers/lane_detection.py +++ b/depthai_nodes/ml/parsers/lane_detection.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_cluster_message -from .base_parser import BaseParser -from .utils.ufld import decode_ufld +from depthai_nodes.ml.messages.creators import create_cluster_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.ufld import decode_ufld class LaneDetectionParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/map_output.py b/depthai_nodes/ml/parsers/map_output.py index b0eb12b8..6267ac0d 100644 --- a/depthai_nodes/ml/parsers/map_output.py +++ b/depthai_nodes/ml/parsers/map_output.py @@ -2,8 +2,8 @@ import depthai as dai -from ..messages.creators import create_map_message -from .base_parser import BaseParser +from depthai_nodes.ml.messages.creators import create_map_message +from depthai_nodes.ml.parsers.base_parser import BaseParser class MapOutputParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/mediapipe_palm_detection.py b/depthai_nodes/ml/parsers/mediapipe_palm_detection.py index 8b3a1432..aed0ff19 100644 --- a/depthai_nodes/ml/parsers/mediapipe_palm_detection.py +++ b/depthai_nodes/ml/parsers/mediapipe_palm_detection.py @@ -4,9 +4,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_detection_message -from .detection import DetectionParser -from .utils import generate_anchors_and_decode +from depthai_nodes.ml.messages.creators import create_detection_message +from depthai_nodes.ml.parsers.detection import DetectionParser +from depthai_nodes.ml.parsers.utils import generate_anchors_and_decode class MPPalmDetectionParser(DetectionParser): diff --git a/depthai_nodes/ml/parsers/mlsd.py b/depthai_nodes/ml/parsers/mlsd.py index 42b1c199..287cd651 100644 --- a/depthai_nodes/ml/parsers/mlsd.py +++ b/depthai_nodes/ml/parsers/mlsd.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_line_detection_message -from .base_parser import BaseParser -from .utils.mlsd import decode_scores_and_points, get_lines +from depthai_nodes.ml.messages.creators import create_line_detection_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.mlsd import decode_scores_and_points, get_lines class MLSDParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/ppdet.py b/depthai_nodes/ml/parsers/ppdet.py index a3e8ec66..2159d947 100644 --- a/depthai_nodes/ml/parsers/ppdet.py +++ b/depthai_nodes/ml/parsers/ppdet.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_detection_message -from .detection import DetectionParser -from .utils import parse_paddle_detection_outputs +from depthai_nodes.ml.messages.creators import create_detection_message +from depthai_nodes.ml.parsers.detection import DetectionParser +from depthai_nodes.ml.parsers.utils import parse_paddle_detection_outputs class PPTextDetectionParser(DetectionParser): diff --git a/depthai_nodes/ml/parsers/regression.py b/depthai_nodes/ml/parsers/regression.py index c501fd15..6485c6ee 100644 --- a/depthai_nodes/ml/parsers/regression.py +++ b/depthai_nodes/ml/parsers/regression.py @@ -3,8 +3,8 @@ import depthai as dai import numpy as np -from ..messages.creators import create_regression_message -from .base_parser import BaseParser +from depthai_nodes.ml.messages.creators import create_regression_message +from depthai_nodes.ml.parsers.base_parser import BaseParser class RegressionParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/scrfd.py b/depthai_nodes/ml/parsers/scrfd.py index 0585d8e2..9a009f12 100644 --- a/depthai_nodes/ml/parsers/scrfd.py +++ b/depthai_nodes/ml/parsers/scrfd.py @@ -3,10 +3,10 @@ import depthai as dai import numpy as np -from ..messages.creators import create_detection_message -from .detection import DetectionParser -from .utils.bbox_format_converters import xyxy_to_xywh -from .utils.scrfd import decode_scrfd +from depthai_nodes.ml.messages.creators import create_detection_message +from depthai_nodes.ml.parsers.detection import DetectionParser +from depthai_nodes.ml.parsers.utils.bbox_format_converters import xyxy_to_xywh +from depthai_nodes.ml.parsers.utils.scrfd import decode_scrfd class SCRFDParser(DetectionParser): diff --git a/depthai_nodes/ml/parsers/segmentation.py b/depthai_nodes/ml/parsers/segmentation.py index e4a8d91f..cca66015 100644 --- a/depthai_nodes/ml/parsers/segmentation.py +++ b/depthai_nodes/ml/parsers/segmentation.py @@ -3,8 +3,8 @@ import depthai as dai import numpy as np -from ..messages.creators import create_segmentation_message -from .base_parser import BaseParser +from depthai_nodes.ml.messages.creators import create_segmentation_message +from depthai_nodes.ml.parsers.base_parser import BaseParser class SegmentationParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/superanimal_landmarker.py b/depthai_nodes/ml/parsers/superanimal_landmarker.py index 84e69de6..701ab1b5 100644 --- a/depthai_nodes/ml/parsers/superanimal_landmarker.py +++ b/depthai_nodes/ml/parsers/superanimal_landmarker.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_keypoints_message -from .keypoints import KeypointParser -from .utils.superanimal import get_pose_prediction +from depthai_nodes.ml.messages.creators import create_keypoints_message +from depthai_nodes.ml.parsers.keypoints import KeypointParser +from depthai_nodes.ml.parsers.utils.superanimal import get_pose_prediction class SuperAnimalParser(KeypointParser): diff --git a/depthai_nodes/ml/parsers/utils/fastsam.py b/depthai_nodes/ml/parsers/utils/fastsam.py index 461e25e5..d7b12025 100644 --- a/depthai_nodes/ml/parsers/utils/fastsam.py +++ b/depthai_nodes/ml/parsers/utils/fastsam.py @@ -3,7 +3,11 @@ import cv2 import numpy as np -from .yolo import non_max_suppression, parse_yolo_outputs, sigmoid +from depthai_nodes.ml.parsers.utils.yolo import ( + non_max_suppression, + parse_yolo_outputs, + sigmoid, +) def box_prompt( diff --git a/depthai_nodes/ml/parsers/utils/keypoints.py b/depthai_nodes/ml/parsers/utils/keypoints.py index ee57b09e..f59fe31f 100644 --- a/depthai_nodes/ml/parsers/utils/keypoints.py +++ b/depthai_nodes/ml/parsers/utils/keypoints.py @@ -2,7 +2,7 @@ import numpy as np -from ...messages.creators.keypoints import Keypoint +from depthai_nodes.ml.messages.creators.keypoints import Keypoint def normalize_keypoints(keypoints: np.ndarray, height: int, width: int) -> np.ndarray: diff --git a/depthai_nodes/ml/parsers/utils/ppdet.py b/depthai_nodes/ml/parsers/utils/ppdet.py index ddca5679..2e888c14 100644 --- a/depthai_nodes/ml/parsers/utils/ppdet.py +++ b/depthai_nodes/ml/parsers/utils/ppdet.py @@ -3,7 +3,9 @@ import cv2 import numpy as np -from .bbox_format_converters import corners_to_rotated_bbox +from depthai_nodes.ml.parsers.utils.bbox_format_converters import ( + corners_to_rotated_bbox, +) def _get_mini_boxes(contour: np.ndarray) -> Tuple[np.ndarray, np.ndarray]: diff --git a/depthai_nodes/ml/parsers/utils/scrfd.py b/depthai_nodes/ml/parsers/utils/scrfd.py index f3f9bf8a..bef443dc 100644 --- a/depthai_nodes/ml/parsers/utils/scrfd.py +++ b/depthai_nodes/ml/parsers/utils/scrfd.py @@ -1,6 +1,6 @@ import numpy as np -from .nms import nms +from depthai_nodes.ml.parsers.utils.nms import nms def distance2bbox(points, distance, max_shape=None): diff --git a/depthai_nodes/ml/parsers/utils/ufld.py b/depthai_nodes/ml/parsers/utils/ufld.py index 6c2f6ed8..346cdbd9 100644 --- a/depthai_nodes/ml/parsers/utils/ufld.py +++ b/depthai_nodes/ml/parsers/utils/ufld.py @@ -2,7 +2,7 @@ import numpy as np -from .softmax import softmax +from depthai_nodes.ml.parsers.utils.softmax import softmax def decode_ufld( diff --git a/depthai_nodes/ml/parsers/utils/yolo.py b/depthai_nodes/ml/parsers/utils/yolo.py index c772df5a..1981fab3 100644 --- a/depthai_nodes/ml/parsers/utils/yolo.py +++ b/depthai_nodes/ml/parsers/utils/yolo.py @@ -4,9 +4,9 @@ import numpy as np -from .bbox_format_converters import xywh_to_xyxy -from .masks_utils import sigmoid -from .nms import nms +from depthai_nodes.ml.parsers.utils.bbox_format_converters import xywh_to_xyxy +from depthai_nodes.ml.parsers.utils.masks_utils import sigmoid +from depthai_nodes.ml.parsers.utils.nms import nms class YOLOSubtype(str, Enum): diff --git a/depthai_nodes/ml/parsers/utils/yunet.py b/depthai_nodes/ml/parsers/utils/yunet.py index a834e52a..008a668b 100644 --- a/depthai_nodes/ml/parsers/utils/yunet.py +++ b/depthai_nodes/ml/parsers/utils/yunet.py @@ -5,8 +5,8 @@ import numpy as np -from .bbox_format_converters import normalize_bboxes -from .keypoints import normalize_keypoints +from depthai_nodes.ml.parsers.utils.bbox_format_converters import normalize_bboxes +from depthai_nodes.ml.parsers.utils.keypoints import normalize_keypoints def manual_product(*args): diff --git a/depthai_nodes/ml/parsers/xfeat.py b/depthai_nodes/ml/parsers/xfeat.py index 0516b4dd..3e2b2f01 100644 --- a/depthai_nodes/ml/parsers/xfeat.py +++ b/depthai_nodes/ml/parsers/xfeat.py @@ -3,9 +3,9 @@ import depthai as dai import numpy as np -from ..messages.creators import create_tracked_features_message -from .base_parser import BaseParser -from .utils.xfeat import detect_and_compute, match +from depthai_nodes.ml.messages.creators import create_tracked_features_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.xfeat import detect_and_compute, match class XFeatBaseParser(BaseParser): diff --git a/depthai_nodes/ml/parsers/yolo.py b/depthai_nodes/ml/parsers/yolo.py index 80fd5c3b..225b99f0 100644 --- a/depthai_nodes/ml/parsers/yolo.py +++ b/depthai_nodes/ml/parsers/yolo.py @@ -4,14 +4,17 @@ import depthai as dai import numpy as np -from ..messages.creators import create_detection_message -from .base_parser import BaseParser -from .utils.bbox_format_converters import normalize_bboxes, xyxy_to_xywh -from .utils.masks_utils import ( +from depthai_nodes.ml.messages.creators import create_detection_message +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils.bbox_format_converters import ( + normalize_bboxes, + xyxy_to_xywh, +) +from depthai_nodes.ml.parsers.utils.masks_utils import ( get_segmentation_outputs, process_single_mask, ) -from .utils.yolo import ( +from depthai_nodes.ml.parsers.utils.yolo import ( YOLOSubtype, decode_yolo_output, parse_kpts, diff --git a/depthai_nodes/ml/parsers/yunet.py b/depthai_nodes/ml/parsers/yunet.py index 8130b717..9d277fbd 100644 --- a/depthai_nodes/ml/parsers/yunet.py +++ b/depthai_nodes/ml/parsers/yunet.py @@ -3,11 +3,15 @@ import depthai as dai import numpy as np -from ..messages.creators import create_detection_message -from .detection import DetectionParser -from .utils.bbox_format_converters import top_left_wh_to_xywh -from .utils.nms import nms_cv2 -from .utils.yunet import decode_detections, format_detections, prune_detections +from depthai_nodes.ml.messages.creators import create_detection_message +from depthai_nodes.ml.parsers.detection import DetectionParser +from depthai_nodes.ml.parsers.utils.bbox_format_converters import top_left_wh_to_xywh +from depthai_nodes.ml.parsers.utils.nms import nms_cv2 +from depthai_nodes.ml.parsers.utils.yunet import ( + decode_detections, + format_detections, + prune_detections, +) class YuNetParser(DetectionParser): diff --git a/depthai_nodes/parser_generator.py b/depthai_nodes/parser_generator.py index e7c204df..f4d77d36 100644 --- a/depthai_nodes/parser_generator.py +++ b/depthai_nodes/parser_generator.py @@ -2,9 +2,9 @@ import depthai as dai -from .ml.parsers import * -from .ml.parsers.base_parser import BaseParser -from .ml.parsers.utils import decode_head +from depthai_nodes.ml.parsers import * +from depthai_nodes.ml.parsers.base_parser import BaseParser +from depthai_nodes.ml.parsers.utils import decode_head class ParserGenerator(dai.node.ThreadedHostNode): diff --git a/depthai_nodes/parsing_neural_network.py b/depthai_nodes/parsing_neural_network.py index 7126ed30..659e6ea2 100644 --- a/depthai_nodes/parsing_neural_network.py +++ b/depthai_nodes/parsing_neural_network.py @@ -3,8 +3,8 @@ import depthai as dai -from .ml.parsers import BaseParser -from .parser_generator import ParserGenerator +from depthai_nodes.ml.parsers import BaseParser +from depthai_nodes.parser_generator import ParserGenerator class ParsingNeuralNetwork(dai.node.ThreadedHostNode):