From 5bb6b87c7d7476335ca7255c4e45af466b706246 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 31 May 2024 15:17:24 -0700 Subject: [PATCH] predict: yolov10m --- plugins/coreml/package-lock.json | 4 ++-- plugins/coreml/package.json | 2 +- plugins/coreml/src/coreml/__init__.py | 8 ++------ plugins/onnx/package-lock.json | 4 ++-- plugins/onnx/package.json | 2 +- plugins/onnx/src/ort/__init__.py | 6 +----- plugins/openvino/package-lock.json | 4 ++-- plugins/openvino/package.json | 2 +- plugins/openvino/src/ov/__init__.py | 6 +----- server/package-lock.json | 4 ++-- 10 files changed, 15 insertions(+), 27 deletions(-) diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index 1435a8ba42..673074ba78 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.53", + "version": "0.1.54", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.53", + "version": "0.1.54", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index a4e5ac17fe..53f9bc31b5 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.53" + "version": "0.1.54" } diff --git a/plugins/coreml/src/coreml/__init__.py b/plugins/coreml/src/coreml/__init__.py index 4c175ddccc..ae2aa73f16 100644 --- a/plugins/coreml/src/coreml/__init__.py +++ b/plugins/coreml/src/coreml/__init__.py @@ -26,17 +26,13 @@ availableModels = [ "Default", + "scrypted_yolov10m_320", "scrypted_yolov10n_320", - "scrypted_yolov10n", "scrypted_yolo_nas_s_320", "scrypted_yolov9c_320", - "scrypted_yolov9c", "scrypted_yolov6n_320", - "scrypted_yolov6n", "scrypted_yolov6s_320", - "scrypted_yolov6s", "scrypted_yolov8n_320", - "scrypted_yolov8n", "ssdlite_mobilenet_v2", "yolov4-tiny", ] @@ -80,7 +76,7 @@ def __init__(self, nativeId: str | None = None): self.storage.setItem("model", "Default") model = "scrypted_yolov9c_320" self.yolo = "yolo" in model - self.scrypted_yolov10n = "scrypted_yolov10n" in model + self.scrypted_yolov10n = "scrypted_yolov10" in model self.scrypted_yolo_nas = "scrypted_yolo_nas" in model self.scrypted_yolo = "scrypted_yolo" in model self.scrypted_model = "scrypted" in model diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json index e05a5091d4..0633a807df 100644 --- a/plugins/onnx/package-lock.json +++ b/plugins/onnx/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.92", + "version": "0.1.93", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.92", + "version": "0.1.93", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json index e108408ba9..a1e1659f9d 100644 --- a/plugins/onnx/package.json +++ b/plugins/onnx/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.92" + "version": "0.1.93" } diff --git a/plugins/onnx/src/ort/__init__.py b/plugins/onnx/src/ort/__init__.py index 28ac4f6961..881cbe34ed 100644 --- a/plugins/onnx/src/ort/__init__.py +++ b/plugins/onnx/src/ort/__init__.py @@ -29,17 +29,13 @@ availableModels = [ "Default", + "scrypted_yolov10m_320", "scrypted_yolov10n_320", - "scrypted_yolov10n", "scrypted_yolo_nas_s_320", "scrypted_yolov6n_320", - "scrypted_yolov6n", "scrypted_yolov6s_320", - "scrypted_yolov6s", "scrypted_yolov9c_320", - "scrypted_yolov9c", "scrypted_yolov8n_320", - "scrypted_yolov8n", ] def parse_labels(names): diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index a046916014..dbb8fd4147 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.88", + "version": "0.1.89", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.88", + "version": "0.1.89", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index d274fbe5d2..3515d4816c 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.88" + "version": "0.1.89" } diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py index ce29928471..b0ce5e0604 100644 --- a/plugins/openvino/src/ov/__init__.py +++ b/plugins/openvino/src/ov/__init__.py @@ -30,17 +30,13 @@ availableModels = [ "Default", + "scrypted_yolov10m_320", "scrypted_yolov10n_320", - "scrypted_yolov10n", "scrypted_yolo_nas_s_320", "scrypted_yolov6n_320", - "scrypted_yolov6n", "scrypted_yolov6s_320", - "scrypted_yolov6s", "scrypted_yolov9c_320", - "scrypted_yolov9c", "scrypted_yolov8n_320", - "scrypted_yolov8n", "ssd_mobilenet_v1_coco", "ssdlite_mobilenet_v2", "yolo-v3-tiny-tf", diff --git a/server/package-lock.json b/server/package-lock.json index b8d5353693..c5a897dffc 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.107.0", + "version": "0.108.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.107.0", + "version": "0.108.0", "hasInstallScript": true, "license": "ISC", "dependencies": {