michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-03-20 16:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

detect: proper model name

Browse Source
This commit is contained in:
Koushik Dutta
2024-08-06 13:33:22 -07:00
parent 2f4608e697
commit 608f82cf81
13 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/coreml/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/coreml",
"version": "0.1.69",
"version": "0.1.70",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/coreml",
"version": "0.1.69",
"version": "0.1.70",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/coreml/package.json
View File

@@ -42,5 +42,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.69"
"version": "0.1.70"
}

1
plugins/coreml/src/coreml/__init__.py
View File

@@ -85,6 +85,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv
self.scrypted_model = "scrypted" in model
model_version = "v8"
mlmodel = "model" if self.scrypted_yolo else model
self.modelName = model
print(f"model: {model}")

4
plugins/onnx/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/onnx",
"version": "0.1.104",
"version": "0.1.105",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/onnx",
"version": "0.1.104",
"version": "0.1.105",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/onnx/package.json
View File

@@ -42,5 +42,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.104"
"version": "0.1.105"
}

1
plugins/onnx/src/ort/__init__.py
View File

@@ -63,6 +63,7 @@ class ONNXPlugin(
self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
self.scrypted_yolo = "scrypted_yolo" in model
self.scrypted_model = "scrypted" in model
self.modelName = model
print(f"model {model}")

4
plugins/openvino/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/openvino",
"version": "0.1.108",
"version": "0.1.109",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/openvino",
"version": "0.1.108",
"version": "0.1.109",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/openvino/package.json
View File

@@ -42,5 +42,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.108"
"version": "0.1.109"
}

3
plugins/openvino/src/detect/__init__.py
View File

@@ -14,6 +14,7 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
def __init__(self, nativeId: str | None = None):
super().__init__(nativeId=nativeId)
self.loop = asyncio.get_event_loop()
self.modelName = self.pluginId
def getClasses(self) -> list[str]:
pass
@@ -32,7 +33,7 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
async def getDetectionModel(self, settings: Any = None) -> ObjectDetectionModel:
d: ObjectDetectionModel = {
'name': self.pluginId,
'name': self.modelName,
'classes': self.getClasses(),
'triggerClasses': self.getTriggerClasses(),
'inputSize': self.get_input_details(),

1
plugins/openvino/src/ov/__init__.py
View File

@@ -149,6 +149,7 @@ class OpenVINOPlugin(
self.scrypted_yolo = "scrypted_yolo" in model
self.scrypted_model = "scrypted" in model
self.sigmoid = model == "yolo-v4-tiny-tf"
self.modelName = model
print(f"model/mode/precision: {model}/{mode}/{precision}")

4
plugins/tensorflow-lite/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/tensorflow-lite",
"version": "0.1.62",
"version": "0.1.63",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/tensorflow-lite",
"version": "0.1.62",
"version": "0.1.63",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/tensorflow-lite/package.json
View File

@@ -53,5 +53,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.62"
"version": "0.1.63"
}

1
plugins/tensorflow-lite/src/tflite/__init__.py
View File

@@ -100,6 +100,7 @@ class TensorFlowLitePlugin(
self.yolo = "yolo" in model
self.yolov9 = "yolov9" in model
self.scrypted_model = "scrypted" in model
self.modelName = model
print(f"model: {model}")