From 37c791f14742b00959cefcdd6a484e2f2d1b67dd Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 29 Jun 2024 15:22:02 -0700 Subject: [PATCH] predict: update opencv dep, make required --- plugins/coreml/package-lock.json | 4 ++-- plugins/coreml/package.json | 2 +- plugins/coreml/src/requirements.optional.txt | 1 - plugins/coreml/src/requirements.txt | 3 ++- plugins/onnx/package-lock.json | 10 +++++----- plugins/onnx/package.json | 2 +- plugins/onnx/src/requirements.optional.txt | 1 - plugins/onnx/src/requirements.txt | 1 + plugins/openvino/package-lock.json | 4 ++-- plugins/openvino/package.json | 2 +- plugins/openvino/src/requirements.optional.txt | 1 - plugins/openvino/src/requirements.txt | 3 ++- 12 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 plugins/coreml/src/requirements.optional.txt delete mode 100644 plugins/onnx/src/requirements.optional.txt delete mode 100644 plugins/openvino/src/requirements.optional.txt diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index d629624a2..a7a565878 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.65", + "version": "0.1.66", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.65", + "version": "0.1.66", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index 3389c71a7..4f1824982 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.65" + "version": "0.1.66" } diff --git a/plugins/coreml/src/requirements.optional.txt b/plugins/coreml/src/requirements.optional.txt deleted file mode 100644 index 5891a6757..000000000 --- a/plugins/coreml/src/requirements.optional.txt +++ /dev/null @@ -1 +0,0 @@ -opencv-python==4.10.0.82 diff --git a/plugins/coreml/src/requirements.txt b/plugins/coreml/src/requirements.txt index 133b0cb99..ca6b04fe4 100644 --- a/plugins/coreml/src/requirements.txt +++ b/plugins/coreml/src/requirements.txt @@ -1,4 +1,5 @@ # must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0. numpy==1.26.4 -coremltools==7.1 +coremltools==7.2 Pillow==10.3.0 +opencv-python==4.10.0.84 \ No newline at end of file diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json index 83c9b02e9..2b33f830a 100644 --- a/plugins/onnx/package-lock.json +++ b/plugins/onnx/package-lock.json @@ -1,19 +1,19 @@ { - "name": "@scrypted/openvino", - "version": "0.1.103", + "name": "@scrypted/onnx", + "version": "0.1.104", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@scrypted/openvino", - "version": "0.1.103", + "name": "@scrypted/onnx", + "version": "0.1.104", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.29", + "version": "0.3.31", "dev": true, "license": "ISC", "dependencies": { diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json index 5ba4ebed1..5ba253386 100644 --- a/plugins/onnx/package.json +++ b/plugins/onnx/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.103" + "version": "0.1.104" } diff --git a/plugins/onnx/src/requirements.optional.txt b/plugins/onnx/src/requirements.optional.txt deleted file mode 100644 index 5891a6757..000000000 --- a/plugins/onnx/src/requirements.optional.txt +++ /dev/null @@ -1 +0,0 @@ -opencv-python==4.10.0.82 diff --git a/plugins/onnx/src/requirements.txt b/plugins/onnx/src/requirements.txt index 1d05e9fa0..ca55d77f7 100644 --- a/plugins/onnx/src/requirements.txt +++ b/plugins/onnx/src/requirements.txt @@ -11,3 +11,4 @@ onnxruntime; 'linux' not in sys_platform or platform_machine != 'x86_64' # ort-nightly-gpu==1.17.3.dev20240409002 Pillow==10.3.0 +opencv-python==4.10.0.84 diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index 1ab391fb2..4bea85357 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.105", + "version": "0.1.107", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.105", + "version": "0.1.107", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index 79a96de48..dd0e84c22 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.105" + "version": "0.1.107" } diff --git a/plugins/openvino/src/requirements.optional.txt b/plugins/openvino/src/requirements.optional.txt deleted file mode 100644 index 5891a6757..000000000 --- a/plugins/openvino/src/requirements.optional.txt +++ /dev/null @@ -1 +0,0 @@ -opencv-python==4.10.0.82 diff --git a/plugins/openvino/src/requirements.txt b/plugins/openvino/src/requirements.txt index ef53decae..97ba79f04 100644 --- a/plugins/openvino/src/requirements.txt +++ b/plugins/openvino/src/requirements.txt @@ -1,4 +1,5 @@ # must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0. numpy==1.26.4 -openvino==2024.1.0 +openvino==2024.2.0 Pillow==10.3.0 +opencv-python==4.10.0.84