From f43e31b1154e8193e71c276078abd1bd8bf844b8 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Fri, 18 Apr 2025 13:19:29 -0600 Subject: [PATCH] Add yolov9 --- docker/rockchip/rk.mk | 4 ++-- frigate/detectors/plugins/rknn.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/rockchip/rk.mk b/docker/rockchip/rk.mk index c8278f68b9..9bfdc295b1 100644 --- a/docker/rockchip/rk.mk +++ b/docker/rockchip/rk.mk @@ -9,7 +9,7 @@ build-rk: version docker buildx bake --file=docker/rockchip/rk.hcl rk \ --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk -push-rk: build-rk +push-rk: version docker buildx bake --file=docker/rockchip/rk.hcl rk \ - --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk \ + --set rk.tags=crzynik/frigate-rk \ --push \ No newline at end of file diff --git a/frigate/detectors/plugins/rknn.py b/frigate/detectors/plugins/rknn.py index b71de2ad66..5b573cd564 100644 --- a/frigate/detectors/plugins/rknn.py +++ b/frigate/detectors/plugins/rknn.py @@ -11,6 +11,7 @@ from pydantic import Field from frigate.const import MODEL_CACHE_DIR from frigate.detectors.detection_api import DetectionApi from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum +from frigate.util.model import post_process_yolo logger = logging.getLogger(__name__) @@ -284,6 +285,8 @@ class Rknn(DetectionApi): def post_process(self, output): if self.detector_config.model.model_type == ModelTypeEnum.yolonas: return self.post_process_yolonas(output) + elif self.detector_config.model.model_type == ModelTypeEnum.yologeneric: + return post_process_yolo(output, self.width, self.height) elif self.detector_config.model.model_type == ModelTypeEnum.yolox: return self.post_process_yolox(output, self.grids, self.expanded_strides) else: