diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index d9bd09cca9..f60708961a 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.3", + "version": "0.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.3", + "version": "0.1.4", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index f4459465fa..4ae7af8ca6 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -41,5 +41,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.3" + "version": "0.1.4" } diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json index 467cedffe4..1e33a97ed2 100644 --- a/plugins/opencv/package-lock.json +++ b/plugins/opencv/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/opencv", - "version": "0.0.68", + "version": "0.0.69", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/opencv", - "version": "0.0.68", + "version": "0.0.69", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json index 979635de56..33a8e67238 100644 --- a/plugins/opencv/package.json +++ b/plugins/opencv/package.json @@ -36,5 +36,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.68" + "version": "0.0.69" } diff --git a/plugins/opencv/src/requirements.txt b/plugins/opencv/src/requirements.txt index e75118c73a..172b88aa29 100644 --- a/plugins/opencv/src/requirements.txt +++ b/plugins/opencv/src/requirements.txt @@ -1,6 +1,11 @@ # plugin numpy>=1.16.2 -Pillow>=5.4.1 +# pillow for anything not intel linux +Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64' +pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64' PyGObject>=3.30.4; sys_platform != 'win32' -av>=10.0.0; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64' imutils>=0.5.0 +# not available on armhf +av>=10.0.0; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64' +# not available on armhf +opencv-python; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64' diff --git a/plugins/sort-tracker/sort_oh b/plugins/sort-tracker/sort_oh index 16a46b77f7..3db0328cd3 160000 --- a/plugins/sort-tracker/sort_oh +++ b/plugins/sort-tracker/sort_oh @@ -1 +1 @@ -Subproject commit 16a46b77f7702f6837bd25ba1c18cd2b5e12a1f8 +Subproject commit 3db0328cd34f1bc1070cc3ddf47060e476eff553 diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json index 374cb019c0..0f53ab1f7c 100644 --- a/plugins/tensorflow-lite/package-lock.json +++ b/plugins/tensorflow-lite/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/tensorflow-lite", - "version": "0.1.3", + "version": "0.1.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/tensorflow-lite", - "version": "0.1.3", + "version": "0.1.5", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json index 35e49465cf..d2aaac477f 100644 --- a/plugins/tensorflow-lite/package.json +++ b/plugins/tensorflow-lite/package.json @@ -44,5 +44,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.3" + "version": "0.1.5" } diff --git a/plugins/tensorflow/package-lock.json b/plugins/tensorflow/package-lock.json index 0f53ab1f7c..f56641912d 100644 --- a/plugins/tensorflow/package-lock.json +++ b/plugins/tensorflow/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/tensorflow-lite", - "version": "0.1.5", + "version": "0.1.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/tensorflow-lite", - "version": "0.1.5", + "version": "0.1.7", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/tensorflow/package.json b/plugins/tensorflow/package.json index 381af55c51..36948e345a 100644 --- a/plugins/tensorflow/package.json +++ b/plugins/tensorflow/package.json @@ -41,5 +41,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.5" + "version": "0.1.7" } diff --git a/plugins/tensorflow/src/requirements.txt b/plugins/tensorflow/src/requirements.txt index 4dce018270..0c8263ef94 100644 --- a/plugins/tensorflow/src/requirements.txt +++ b/plugins/tensorflow/src/requirements.txt @@ -1,14 +1,14 @@ # plugin -Pillow>=5.4.1 +numpy>=1.16.2 +# pillow for anything not intel linux +Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64' +pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64' tensorflow-macos; sys_platform == 'darwin' tensorflow; sys_platform != 'darwin' PyGObject>=3.30.4; sys_platform != 'win32' # not available on armhf av>=10.0.0; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64' -# not available on armhf -opencv-python; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64' # sort_oh scipy filterpy -numpy