add yolonas models

This commit is contained in:
MarcA711 2024-05-20 10:58:43 +00:00
parent c00a9b255a
commit de6ae9adb7
2 changed files with 9 additions and 5 deletions

View File

@ -20,7 +20,11 @@ COPY --from=rootfs / /
ADD https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/librknnrt.so /usr/lib/
# TODO removed models, other models support may need to be added back in
ADD https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/deci-fp16-yolonas_s-rk3562-v2.0.0-1.rknn /models/
ADD https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/deci-fp16-yolonas_s-rk3566-v2.0.0-1.rknn /models/
ADD https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/deci-fp16-yolonas_s-rk3568-v2.0.0-1.rknn /models/
ADD https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/deci-fp16-yolonas_s-rk3576-v2.0.0-1.rknn /models/
ADD https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/deci-fp16-yolonas_s-rk3588-v2.0.0-1.rknn /models/
RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffmpeg
RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffprobe

View File

@ -15,9 +15,9 @@ DETECTOR_KEY = "rknn"
supported_socs = ["rk3562", "rk3566", "rk3568", "rk3576", "rk3588"]
supported_models = ["^default-fp16-yolonas_[sml]$"]
supported_models = ["^deci-fp16-yolonas_[sml]$"]
default_model = "default-fp16-yolonas_s"
default_model = "deci-fp16-yolonas_s"
model_chache_dir = "/config/model_cache/rknn_cache/"
@ -95,7 +95,7 @@ class Rknn(DetectionApi):
model_props["filename"] = model_path + f"-{soc}-v2.0.0-1.rknn"
if model_path == default_model:
model_path["path"] = "/models/" + model_props["filename"]
model_props["path"] = "/models/" + model_props["filename"]
else:
model_props["path"] = model_chache_dir + model_props["filename"]
@ -116,7 +116,7 @@ class Rknn(DetectionApi):
os.mkdir(model_chache_dir)
urllib.request.urlretrieve(
f"https://github.com/MarcA711/rknn-models/releases/tag/v2.0.0/{filename}",
f"https://github.com/MarcA711/rknn-models/releases/download/v2.0.0/{filename}",
model_chache_dir + filename,
)