detect: yolov6

koush · Apr 19, 2024 · 7cf0c42 · 7cf0c42
1 parent 2510faf
commit 7cf0c42
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 14 deletions.
diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json
diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.39"
+   "version": "0.1.40"
 }
diff --git a/plugins/coreml/src/coreml/__init__.py b/plugins/coreml/src/coreml/__init__.py
@@ -23,6 +23,8 @@
     "Default",
     "scrypted_yolov9c_320",
     "scrypted_yolov9c",
+    "scrypted_yolov6n_320",
+    "scrypted_yolov6n",
     "scrypted_yolov8n_320",
     "scrypted_yolov8n",
     "ssdlite_mobilenet_v2",

diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json
diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.71"
+   "version": "0.1.73"
 }
diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py
@@ -23,6 +23,8 @@
 
 availableModels = [
     "Default",
+    "scrypted_yolov6n_320",
+    "scrypted_yolov6n",
     "scrypted_yolov9c_320",
     "scrypted_yolov9c",
     "scrypted_yolov8n_320",

diff --git a/plugins/tensorflow-lite/.vscode/settings.json b/plugins/tensorflow-lite/.vscode/settings.json
@@ -9,7 +9,7 @@
     // "scrypted.serverRoot": "/home/pi/.scrypted",
 
     // lxc installation
-    "scrypted.debugHost": "scrypted-server",
+    "scrypted.debugHost": "scrypted-test",
     "scrypted.serverRoot": "/root/.scrypted",
 
     // local checkout

diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json
diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json
@@ -53,5 +53,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.54"
+   "version": "0.1.55"
 }
diff --git a/plugins/tensorflow-lite/src/common b/plugins/tensorflow-lite/src/common
@@ -0,0 +1 @@
+../../openvino/src/common
diff --git a/plugins/tensorflow-lite/src/tflite/__init__.py b/plugins/tensorflow-lite/src/tflite/__init__.py
@@ -5,7 +5,7 @@
 from PIL import Image
 from pycoral.adapters import detect
 
-from .common import *
+from .tflite_common import *
 
 loaded_py_coral = False
 try:
@@ -26,15 +26,17 @@
 import tflite_runtime.interpreter as tflite
 from scrypted_sdk.types import Setting, SettingValue
 
-import yolo
+from common import yolo
 from predict import PredictPlugin
 
 availableModels = [
     "Default",
     "ssd_mobilenet_v2_coco_quant_postprocess",
     "tf2_ssd_mobilenet_v2_coco17_ptq",
     "ssdlite_mobiledet_coco_qat_postprocess",
+    "scrypted_yolov6n_320",
     "scrypted_yolov9c_320",
+    "scrypted_yolov8n_320",
     "efficientdet_lite0_320_ptq",
     "efficientdet_lite1_384_ptq",
     "efficientdet_lite2_448_ptq",
@@ -243,7 +245,7 @@ def predict():
                         # this code path is unused.
                         objs = yolo.parse_yolov9(x[0], scale=lambda v: v * input_scale)
                 else:
-                    common.set_input(interpreter, input)
+                    tflite_common.set_input(interpreter, input)
                     interpreter.invoke()
                     objs = detect.get_objects(
                         interpreter, score_threshold=0.2, image_scale=(1, 1)

diff --git a/plugins/tensorflow-lite/src/tflite/common.py → ...nsorflow-lite/src/tflite/tflite_common.py b/plugins/tensorflow-lite/src/tflite/common.py → ...nsorflow-lite/src/tflite/tflite_common.py
diff --git a/plugins/tensorflow-lite/src/yolo b/plugins/tensorflow-lite/src/yolo