From 60923ac1e34f274399aa2632a36fd528749edb0a Mon Sep 17 00:00:00 2001 From: Marc Altmann <40744649+MarcA711@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:26:41 +0200 Subject: [PATCH] RKNN: Fix broken models for Toolkit v2.3.2 (#19189) * update models * don't set input_dtype: float for yolov9 (rknn) --- docs/docs/configuration/object_detectors.md | 1 - frigate/detectors/plugins/rknn.py | 20 ++------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/docs/docs/configuration/object_detectors.md b/docs/docs/configuration/object_detectors.md index 0a2cf7833..d48ae1de5 100644 --- a/docs/docs/configuration/object_detectors.md +++ b/docs/docs/configuration/object_detectors.md @@ -894,7 +894,6 @@ model: # required width: 320 height: 320 input_tensor: nhwc - input_dtype: float labelmap_path: /labelmap/coco-80.txt ``` diff --git a/frigate/detectors/plugins/rknn.py b/frigate/detectors/plugins/rknn.py index 1fdd8b9c0..828507c54 100644 --- a/frigate/detectors/plugins/rknn.py +++ b/frigate/detectors/plugins/rknn.py @@ -119,7 +119,7 @@ class Rknn(DetectionApi): model_props["model_type"] = model_type if model_matched: - model_props["filename"] = model_path + f"-{soc}-v2.3.2-1.rknn" + model_props["filename"] = model_path + f"-{soc}-v2.3.2-2.rknn" model_props["path"] = model_cache_dir + model_props["filename"] @@ -140,26 +140,10 @@ class Rknn(DetectionApi): os.mkdir(model_cache_dir) urllib.request.urlretrieve( - f"https://github.com/MarcA711/rknn-models/releases/download/v2.3.2/{filename}", + f"https://github.com/MarcA711/rknn-models/releases/download/v2.3.2-2/{filename}", model_cache_dir + filename, ) - def check_config(self, config): - if (config.model.width != 320) or (config.model.height != 320): - raise Exception( - "Make sure to set the model width and height to 320 in your config." - ) - - if config.model.input_pixel_format != "bgr": - raise Exception( - 'Make sure to set the model input_pixel_format to "bgr" in your config.' - ) - - if config.model.input_tensor != "nhwc": - raise Exception( - 'Make sure to set the model input_tensor to "nhwc" in your config.' - ) - def post_process_yolonas(self, output: list[np.ndarray]): """ @param output: output of inference