openvino/lxc: fix crashing

Author: koush

plugins/core/package-lock.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/core",
-   "version": "0.3.70",
+   "version": "0.3.71",
    "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
    "author": "Scrypted",
    "license": "Apache-2.0",

plugins/core/package.json

@@ -1,8 +1,8 @@
-import fs from 'fs';
+import sdk from '@scrypted/sdk';
 import child_process from 'child_process';
 import { once } from 'events';
-import sdk from '@scrypted/sdk';
-import { stdout } from 'process';
+import fs from 'fs';
+import os from 'os';
 
 export const SCRYPTED_INSTALL_ENVIRONMENT_LXC = 'lxc';
 
@@ -43,38 +43,51 @@ export async function checkLxcDependencies() {
     }
 
     try {
-        // intel opencl icd is broken from their official apt repos on kernel versions 6.8, which ships with ubuntu 24.04 and proxmox 8.2.
-        // the intel apt repo has not been updated yet.
-        // the current workaround is to install the release manually.
-        // https://github.com/intel/compute-runtime/releases/tag/24.13.29138.7
-        const output = await new Promise<string>((r,f)=> child_process.exec("sh -c 'apt show versions intel-opencl-icd'", (err, stdout, stderr) => {
+        const output = await new Promise<string>((r, f) => child_process.exec("sh -c 'apt show versions level-zero'", (err, stdout, stderr) => {
             if (err && !stdout && !stderr)
                 f(err);
             else
                 r(stdout + '\n' + stderr);
         }));
 
-        if (
-            // apt
-            output.includes('Version: 23')
-            // was installed via script at some point
-            || output.includes('Version: 24.13.29138.7')
-            // current script version: 24.17.29377.6
+        const cpuModel = os.cpus()[0].model;
+        if (cpuModel.includes('Core') && cpuModel.includes('Ultra')) {
+            if (
+                // apt
+                output.includes('No packages found')
             ) {
-            const cp = child_process.spawn('sh', ['-c', 'curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-graphics.sh | bash']);
-            const [exitCode] = await once(cp, 'exit');
-            if (exitCode !== 0)
-                sdk.log.a('Failed to install intel-opencl-icd.');
-            else
-                needRestart = true;
+                const cp = child_process.spawn('sh', ['-c', 'curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-npu.sh | bash']);
+                const [exitCode] = await once(cp, 'exit');
+                if (exitCode !== 0)
+                    sdk.log.a('Failed to install intel-driver-compiler-npu.');
+                else
+                    needRestart = true;
+            }
+        }
+        else {
+            // level-zero crashes openvino on older CPU due to illegal instruction.
+            // so ensure it is not installed if this is not a core ultra system with npu.
+            if (
+                // apt
+                !output.includes('No packages found')
+            ) {
+                const cp = child_process.spawn('apt', ['-y', 'remove', 'level-zero']);
+                const [exitCode] = await once(cp, 'exit');
+                console.log('level-zero removed', exitCode);
+            }
         }
+
     }
     catch (e) {
-        sdk.log.a('Failed to verify/install intel-opencl-icd version.');
+        sdk.log.a('Failed to verify/install intel-driver-compiler-npu.');
     }
 
     try {
-        const output = await new Promise<string>((r,f)=> child_process.exec("sh -c 'apt show versions intel-driver-compiler-npu'", (err, stdout, stderr) => {
+        // intel opencl icd is broken from their official apt repos on kernel versions 6.8, which ships with ubuntu 24.04 and proxmox 8.2.
+        // the intel apt repo has not been updated yet.
+        // the current workaround is to install the release manually.
+        // https://github.com/intel/compute-runtime/releases/tag/24.13.29138.7
+        const output = await new Promise<string>((r, f) => child_process.exec("sh -c 'apt show versions intel-opencl-icd'", (err, stdout, stderr) => {
             if (err && !stdout && !stderr)
                 f(err);
             else
@@ -83,18 +96,21 @@ export async function checkLxcDependencies() {
 
         if (
             // apt
-            output.includes('No packages found')
-            ) {
-            const cp = child_process.spawn('sh', ['-c', 'curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-npu.sh | bash']);
+            output.includes('Version: 23')
+            // was installed via script at some point
+            || output.includes('Version: 24.13.29138.7')
+            // current script version: 24.17.29377.6
+        ) {
+            const cp = child_process.spawn('sh', ['-c', 'curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-graphics.sh | bash']);
             const [exitCode] = await once(cp, 'exit');
             if (exitCode !== 0)
-                sdk.log.a('Failed to install intel-driver-compiler-npu.');
+                sdk.log.a('Failed to install intel-opencl-icd.');
             else
                 needRestart = true;
         }
     }
     catch (e) {
-        sdk.log.a('Failed to verify/install intel-driver-compiler-npu.');
+        sdk.log.a('Failed to verify/install intel-opencl-icd version.');
     }
 
     if (needRestart)

plugins/core/src/platform/lxc.ts

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

plugins/openvino/package-lock.json

@@ -202,16 +202,16 @@ def __init__(self, nativeId: str | None = None):
         try:
             self.compiled_model = self.core.compile_model(xmlFile, mode)
         except:
+            import traceback
+            traceback.print_exc()
+
             if mode == "GPU":
                 try:
                     print("GPU mode failed, reverting to AUTO.")
                     mode = "AUTO"
                     self.mode = mode
                     self.compiled_model = self.core.compile_model(xmlFile, mode)
                 except:
-                    import traceback
-
-                    traceback.print_exc()
                     print("Reverting all settings.")
                     self.storage.removeItem("mode")
                     self.storage.removeItem("model")

plugins/openvino/package.json

@@ -1,8 +1,7 @@
 # must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
 numpy==1.26.4
-# openvino 2024.3.0 crashes on older CPU
-# openvino 2024.2.0 crashes on current CPU.
-# older versions unsure about NPU support.
+# openvino 2024.3.0 crashes on older CPU (J4105 and older) if level-zero is installed via apt.
+# openvino 2024.2.0 and older crashes on arc dGPU.
 openvino==2024.3.0
 Pillow==10.3.0
 opencv-python==4.10.0.84