detect: clean up requirements

koush · Mar 20, 2023 · 8830091 · 8830091
1 parent 7face43
commit 8830091
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 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
@@ -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
diff --git 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
@@ -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
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
@@ -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
diff --git 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
@@ -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