mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-06-30 09:01:14 +03:00
Nanodet Plus support
This commit is contained in:
parent
ad968efd3e
commit
5a87e0180a
@ -42,6 +42,7 @@ class ModelTypeEnum(str, Enum):
|
|||||||
yolox = "yolox"
|
yolox = "yolox"
|
||||||
yolonas = "yolonas"
|
yolonas = "yolonas"
|
||||||
yologeneric = "yolo-generic"
|
yologeneric = "yolo-generic"
|
||||||
|
nanodet_plus = "nanodet_plus"
|
||||||
|
|
||||||
|
|
||||||
class ModelConfig(BaseModel):
|
class ModelConfig(BaseModel):
|
||||||
|
|||||||
@ -14,6 +14,7 @@ from frigate.detectors.detector_config import (
|
|||||||
)
|
)
|
||||||
from frigate.util.model import (
|
from frigate.util.model import (
|
||||||
post_process_dfine,
|
post_process_dfine,
|
||||||
|
post_process_nanodet_plus,
|
||||||
post_process_rfdetr,
|
post_process_rfdetr,
|
||||||
post_process_yolo,
|
post_process_yolo,
|
||||||
post_process_yolox,
|
post_process_yolox,
|
||||||
@ -137,6 +138,12 @@ class ONNXDetector(DetectionApi):
|
|||||||
self.grids,
|
self.grids,
|
||||||
self.expanded_strides,
|
self.expanded_strides,
|
||||||
)
|
)
|
||||||
|
elif self.onnx_model_type == ModelTypeEnum.nanodet_plus:
|
||||||
|
return post_process_nanodet_plus(
|
||||||
|
tensor_output[0],
|
||||||
|
self.width,
|
||||||
|
self.height,
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
f"{self.onnx_model_type} is currently not supported for onnx. See the docs for more info on supported models."
|
f"{self.onnx_model_type} is currently not supported for onnx. See the docs for more info on supported models."
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
"""Model Utils"""
|
"""Model Utils"""
|
||||||
|
|
||||||
|
import functools
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from typing import Any
|
from typing import Any
|
||||||
@ -7,6 +8,7 @@ from typing import Any
|
|||||||
import cv2
|
import cv2
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import onnxruntime as ort
|
import onnxruntime as ort
|
||||||
|
import scipy.special
|
||||||
|
|
||||||
from frigate.const import MODEL_CACHE_DIR
|
from frigate.const import MODEL_CACHE_DIR
|
||||||
|
|
||||||
@ -16,6 +18,51 @@ logger = logging.getLogger(__name__)
|
|||||||
### Post Processing
|
### Post Processing
|
||||||
|
|
||||||
|
|
||||||
|
@functools.lru_cache
|
||||||
|
def nanodet_center_priors(
|
||||||
|
input_height: int, input_width: int, strides: tuple, dtype: type
|
||||||
|
):
|
||||||
|
def get_single_level_center_priors(featmap_size, stride, dtype):
|
||||||
|
"""Generate centers of a single stage feature map.
|
||||||
|
Args:
|
||||||
|
batch_size (int): Number of images in one batch.
|
||||||
|
featmap_size (tuple[int]): height and width of the feature map
|
||||||
|
stride (int): down sample stride of the feature map
|
||||||
|
dtype (obj:`torch.dtype`): data type of the tensors
|
||||||
|
device (obj:`torch.device`): device of the tensors
|
||||||
|
Return:
|
||||||
|
priors (Tensor): center priors of a single level feature map.
|
||||||
|
"""
|
||||||
|
h, w = featmap_size
|
||||||
|
x_range = (np.arange(w, dtype=dtype)) * stride
|
||||||
|
y_range = (np.arange(h, dtype=dtype)) * stride
|
||||||
|
y, x = np.meshgrid(y_range, x_range, indexing="ij")
|
||||||
|
y = y.flatten()
|
||||||
|
x = x.flatten()
|
||||||
|
strides = np.full(x.shape[0], stride)
|
||||||
|
priors = np.stack([x, y, strides, strides], axis=-1)
|
||||||
|
return priors
|
||||||
|
|
||||||
|
featmap_sizes = [
|
||||||
|
(
|
||||||
|
int(np.ceil(input_height / stride)),
|
||||||
|
int(np.ceil(input_width) / stride),
|
||||||
|
)
|
||||||
|
for stride in strides
|
||||||
|
]
|
||||||
|
mlvl_center_priors = [
|
||||||
|
get_single_level_center_priors(
|
||||||
|
featmap_sizes[i],
|
||||||
|
stride,
|
||||||
|
dtype,
|
||||||
|
)
|
||||||
|
for i, stride in enumerate(strides)
|
||||||
|
]
|
||||||
|
center_priors = np.concatenate(mlvl_center_priors, axis=0)
|
||||||
|
|
||||||
|
return center_priors
|
||||||
|
|
||||||
|
|
||||||
def post_process_dfine(
|
def post_process_dfine(
|
||||||
tensor_output: np.ndarray, width: int, height: int
|
tensor_output: np.ndarray, width: int, height: int
|
||||||
) -> np.ndarray:
|
) -> np.ndarray:
|
||||||
@ -280,6 +327,66 @@ def post_process_yolox(
|
|||||||
return detections
|
return detections
|
||||||
|
|
||||||
|
|
||||||
|
def post_process_nanodet_plus(
|
||||||
|
predictions: np.ndarray,
|
||||||
|
width: int,
|
||||||
|
height: int,
|
||||||
|
):
|
||||||
|
def distance2bbox(points, distance, max_shape=None):
|
||||||
|
"""Decode distance prediction to bounding box.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
points (Tensor): Shape (n, 2), [x, y].
|
||||||
|
distance (Tensor): Distance from the given point to 4
|
||||||
|
boundaries (left, top, right, bottom).
|
||||||
|
max_shape (tuple): Shape of the image.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Tensor: Decoded bboxes.
|
||||||
|
"""
|
||||||
|
x1 = points[..., 0] - distance[..., 0]
|
||||||
|
y1 = points[..., 1] - distance[..., 1]
|
||||||
|
x2 = points[..., 0] + distance[..., 2]
|
||||||
|
y2 = points[..., 1] + distance[..., 3]
|
||||||
|
if max_shape is not None:
|
||||||
|
x1 = np.clip(x1, 0, max_shape[1])
|
||||||
|
y1 = np.clip(y1, 0, max_shape[0])
|
||||||
|
x2 = np.clip(x2, 0, max_shape[1])
|
||||||
|
y2 = np.clip(y2, 0, max_shape[0])
|
||||||
|
return np.stack([x1, y1, x2, y2], -1)
|
||||||
|
|
||||||
|
predictions = predictions[0]
|
||||||
|
|
||||||
|
# TODO From parameters
|
||||||
|
reg_max = 7
|
||||||
|
strides = (8, 16, 32, 64)
|
||||||
|
|
||||||
|
num_classes = predictions.shape[-1] - 4 * (reg_max + 1)
|
||||||
|
cls_scores, bbox_preds = predictions[:, :num_classes], predictions[:, num_classes:]
|
||||||
|
|
||||||
|
center_priors = nanodet_center_priors(height, width, strides, predictions[0].dtype)
|
||||||
|
|
||||||
|
x = bbox_preds.reshape(bbox_preds.shape[0], 4, reg_max + 1)
|
||||||
|
x = scipy.special.softmax(x, axis=-1)
|
||||||
|
x = np.dot(x, np.linspace(0, reg_max, reg_max + 1))
|
||||||
|
|
||||||
|
dis_preds = x * center_priors[..., 2, None]
|
||||||
|
bboxes = distance2bbox(center_priors[..., :2], dis_preds, max_shape=(height, width))
|
||||||
|
|
||||||
|
class_ids = np.argmax(cls_scores, axis=1)
|
||||||
|
scores = np.max(cls_scores, axis=1)
|
||||||
|
|
||||||
|
detections = np.zeros((20, 6), dtype=np.float32)
|
||||||
|
for i, j in enumerate(np.argsort(scores)[::-1][:20]):
|
||||||
|
detections[i, 0] = class_ids[j]
|
||||||
|
detections[i, 1] = scores[j]
|
||||||
|
detections[i, 2] = bboxes[j, 1] / height
|
||||||
|
detections[i, 3] = bboxes[j, 0] / width
|
||||||
|
detections[i, 4] = bboxes[j, 3] / height
|
||||||
|
detections[i, 5] = bboxes[j, 2] / width
|
||||||
|
return detections
|
||||||
|
|
||||||
|
|
||||||
### ONNX Utilities
|
### ONNX Utilities
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user