Merge branch 'main' into cluster

Author: koush

install/docker/install-nvidia-container-toolkit.sh

@@ -2,9 +2,13 @@ UBUNTU_22_04=$(lsb_release -r | grep "22.04")
 UBUNTU_24_04=$(lsb_release -r | grep "24.04")
 
 set -e
+
+# Install CUDA for 22.04
+# https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=24.04&target_type=deb_network
+# Install CUDA for 24.04
 # https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=24.04&target_type=deb_network
-# need this apt for nvidia-utils
-# needs either ubuntu 22.0.4 or 24.04
+# Do not apt install nvidia-open, must use cuda-drivers.
+
 if [ -z "$UBUNTU_22_04" ] && [ -z "$UBUNTU_24_04" ]
 then
     echo "NVIDIA container toolkit can not be installed. Ubuntu version could not be detected when checking lsb-release and /etc/os-release."

plugins/diagnostics/.vscode/settings.json

@@ -1,4 +1,4 @@
 
 {
-    "scrypted.debugHost": "scrypted-nvr",
+    "scrypted.debugHost": "koushik-winvm",
 }

plugins/diagnostics/package-lock.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/diagnostics",
-   "version": "0.0.18",
+   "version": "0.0.19",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",

plugins/diagnostics/package.json

@@ -294,6 +294,8 @@ class DiagnosticsPlugin extends ScryptedDeviceBase implements Settings {
 
         const nvrPlugin = sdk.systemManager.getDeviceById('@scrypted/nvr');
         const cloudPlugin = sdk.systemManager.getDeviceById('@scrypted/cloud');
+        const hasCUDA = process.env.NVIDIA_VISIBLE_DEVICES && process.env.NVIDIA_DRIVER_CAPABILITIES;
+        const onnxPlugin = sdk.systemManager.getDeviceById<Settings & ObjectDetection>('@scrypted/onnx');
         const openvinoPlugin = sdk.systemManager.getDeviceById<Settings & ObjectDetection>('@scrypted/openvino');
 
         await this.validate(this.console, 'Scrypted Installation', async () => {
@@ -367,10 +369,14 @@ class DiagnosticsPlugin extends ScryptedDeviceBase implements Settings {
         });
 
         if (process.platform === 'linux' && nvrPlugin) {
-            // ensure /dev/dri/renderD128 is available
+            // ensure /dev/dri/renderD128 or /dev/dri/renderD129 is available
             await this.validate(this.console, 'GPU Passthrough', async () => {
-                if (!fs.existsSync('/dev/dri/renderD128'))
-                    throw new Error('GPU device unvailable or not passed through to container.');
+                if (!fs.existsSync('/dev/dri/renderD128') && !fs.existsSync('/dev/dri/renderD129'))
+                    throw new Error('GPU device unvailable or not passed through to container. (/dev/dri/renderD128, /dev/dri/renderD129)');
+                // also check /dev/kfd for AMD CPU
+                const amdCPU = os.cpus().find(c => c.model.includes('AMD'));
+                if (amdCPU && !fs.existsSync('/dev/kfd'))
+                    throw new Error('GPU device unvailable or not passed through to container. (/dev/kfd)');
             });
         }
 
@@ -406,7 +412,22 @@ class DiagnosticsPlugin extends ScryptedDeviceBase implements Settings {
                 throw new Error('Invalid response received from short lived URL.');
         });
 
-        if (openvinoPlugin) {
+        if ((hasCUDA || process.platform === 'win32') && onnxPlugin) {
+            await this.validate(this.console, 'ONNX Plugin', async () => {
+                const settings = await onnxPlugin.getSettings();
+                const executionDevice = settings.find(s => s.key === 'execution_device');
+                if (executionDevice?.value?.toString().includes('CPU'))
+                    this.warnStep(this.console, 'GPU device unvailable or not passed through to container.');
+
+                const zidane = await sdk.mediaManager.createMediaObjectFromUrl('https://docs.scrypted.app/img/scrypted-nvr/troubleshooting/zidane.jpg');
+                const detected = await onnxPlugin.detectObjects(zidane);
+                const personFound = detected.detections!.find(d => d.className === 'person' && d.score > .9);
+                if (!personFound)
+                    throw new Error('Person not detected in test image.');
+            });
+        }
+
+        if (!hasCUDA && openvinoPlugin && (process.platform !== 'win32' || !onnxPlugin)) {
             await this.validate(this.console, 'OpenVINO Plugin', async () => {
                 const settings = await openvinoPlugin.getSettings();
                 const availbleDevices = settings.find(s => s.key === 'available_devices');

plugins/diagnostics/src/main.ts

@@ -1,7 +1,7 @@
 
 {
     // docker installation
-    "scrypted.debugHost": "scrypted-nvr",
+    "scrypted.debugHost": "koushik-winvm",
     "scrypted.serverRoot": "/server",
 
     // pi local installation

plugins/onnx/.vscode/settings.json

@@ -47,5 +47,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.115"
+   "version": "0.1.117"
 }

plugins/onnx/package-lock.json

@@ -83,8 +83,9 @@ def __init__(self, nativeId: str | None = None):
             deviceIds = ["0"]
         self.deviceIds = deviceIds
 
-        compiled_models = []
-        self.compiled_models = {}
+        compiled_models: list[onnxruntime.InferenceSession] = []
+        self.compiled_models: dict[str, onnxruntime.InferenceSession] = {}
+        self.provider = "Unknown"
 
         try:
             for deviceId in deviceIds:
@@ -121,6 +122,14 @@ def executor_initializer():
             thread_name = threading.current_thread().name
             interpreter = compiled_models.pop()
             self.compiled_models[thread_name] = interpreter
+            # remove CPUExecutionProider from providers
+            providers = interpreter.get_providers()
+            if not len(providers):
+                providers = ["CPUExecutionProvider"]
+            if "CPUExecutionProvider" in providers:
+                providers.remove("CPUExecutionProvider")
+            # join the remaining providers string
+            self.provider = ", ".join(providers)
             print('Runtime initialized on thread {}'.format(thread_name))
 
         self.executor = concurrent.futures.ThreadPoolExecutor(
@@ -134,6 +143,8 @@ def executor_initializer():
             thread_name_prefix="onnx-prepare",
         )
 
+        self.executor.submit(lambda: None)
+
         self.faceDevice = None
         self.textDevice = None
         asyncio.ensure_future(self.prepareRecognitionModels(), loop=self.loop)
@@ -206,7 +217,7 @@ async def getSettings(self) -> list[Setting]:
                 "key": "execution_device",
                 "title": "Execution Device",
                 "readonly": True,
-                "value": onnxruntime.get_device(),
+                "value": self.provider,
             }
         ]
 

plugins/onnx/package.json

@@ -48,5 +48,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.128"
-}
+   "version": "0.1.129"
+}

plugins/onnx/src/ort/__init__.py

@@ -30,8 +30,7 @@
 
 availableModels = [
     "Default",
-    "scrypted_yolov9c_junk_320",
-    "scrypted_yolov9t_yuv_320",
+    "scrypted_yolov9c_relu_int8_320",
     "scrypted_yolov10m_320",
     "scrypted_yolov10s_320",
     "scrypted_yolov10n_320",