onnx: update

koush · May 4, 2024 · ab157b1 · ab157b1
1 parent 05cad81
commit ab157b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/plugins/onnx/.vscode/settings.json b/plugins/onnx/.vscode/settings.json
@@ -3,14 +3,16 @@
     // docker installation
     // "scrypted.debugHost": "koushik-ubuntuvm",
     // "scrypted.serverRoot": "/server",
+    "scrypted.debugHost": "koushik-ubuntuvm",
+    "scrypted.serverRoot": "/home/koush/.scrypted",
 
     // pi local installation
     // "scrypted.debugHost": "192.168.2.119",
     // "scrypted.serverRoot": "/home/pi/.scrypted",
 
     // local checkout
-    "scrypted.debugHost": "127.0.0.1",
-    "scrypted.serverRoot": "/Users/koush/.scrypted",
+    // "scrypted.debugHost": "127.0.0.1",
+    // "scrypted.serverRoot": "/Users/koush/.scrypted",
     // "scrypted.debugHost": "koushik-winvm",
     // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
 

diff --git a/plugins/onnx/src/ort/__init__.py b/plugins/onnx/src/ort/__init__.py
@@ -73,7 +73,7 @@ def __init__(self, nativeId: str | None = None):
             if sys.platform == 'darwin':
                 providers.append("CoreMLExecutionProvider")
 
-            if sys.platform == 'linux' and platform.machine() == 'x86_64':
+            if 'linux' in sys.platform and platform.machine() == 'x86_64':
                 providers.append("CUDAExecutionProvider")
 
             providers.append('CPUExecutionProvider')

diff --git a/plugins/onnx/src/requirements.txt b/plugins/onnx/src/requirements.txt
@@ -1,11 +1,13 @@
---extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
-# cuda 12
-onnxruntime-gpu; sys_platform == 'linux' and platform_machine == 'x86_64'
+# uncomment to require cuda 12, but most stuff is still targetting cuda 11.
+# however, stuff targetted for cuda 11 can still run on cuda 12.
+# --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+
+onnxruntime-gpu; 'linux' in sys_platform and platform_machine == 'x86_64'
 # cpu and coreml execution provider
-onnxruntime; sys_platform != 'linux' or platform_machine != 'x86_64'
+onnxruntime; 'linux' not in sys_platform or platform_machine != 'x86_64'
 # ort-nightly-gpu==1.17.3.dev20240409002
 
 # pillow-simd is available on x64 linux
 # pillow-simd confirmed not building with arm64 linux or apple silicon
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
+pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'