Squashed commit of the following:

commit e2dbc3b55af5d1dc7187f0c625a370c94c82f914 Author: Dr. Daniel Hauschildt <daniel.hauschildt@img.ly> Date: Wed May 22 13:03:12 2024 +0100 chore: Updated to OnnxRuntime 1.18 and thus enabling fp16 support for the isnet
imgly · May 22, 2024 · 9b77b77 · 9b77b77
1 parent 5bbd943
commit 9b77b77
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 108 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -64,7 +64,7 @@
     "@types/node": "~20.3.1",
     "lodash": "~4.17.21",
     "ndarray": "~1.0.19",
-    "onnxruntime-node": "~1.17.0",
+    "onnxruntime-node": "~1.18.0",
     "sharp": "~0.32.4",
     "zod": "^3.23.8"
   },

diff --git a/packages/web-data/package.json b/packages/web-data/package.json
@@ -46,6 +46,6 @@
     "package:pack": "npm pack . --pack-destination ../../releases"
   },
   "dependencies": {
-    "onnxruntime-web": "~1.17.0"
+    "onnxruntime-web": "~1.18.0"
   }
 }
diff --git a/packages/web-examples/vite-project/package-lock.json b/packages/web-examples/vite-project/package-lock.json
diff --git a/packages/web-examples/vite-project/src/App.vue b/packages/web-examples/vite-project/src/App.vue
@@ -39,7 +39,6 @@ export default {
     publicPath.pathname = '/js/';
     const config = {
       debug: false,
-      // debug: true,
       publicPath: publicPath.href,
       progress: (key, current, total) => {
         const [type, subtype] = key.split(':');
@@ -51,7 +50,7 @@ export default {
       rescale: true,
       device: 'gpu',
       // device: 'cpu',
-      model: 'isnet',
+      // model: 'isnet',
       // model: 'isnet_fp16',
       // model: 'isnet_quint8',
       output: {

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -64,7 +64,7 @@
     "@types/node": "~20.3.0",
     "lodash-es": "^4.17.21",
     "ndarray": "~1.0.0",
-    "onnxruntime-web": "~1.17.0",
+    "onnxruntime-web": "~1.18.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {

diff --git a/packages/web/src/schema.ts b/packages/web/src/schema.ts
@@ -103,19 +103,8 @@ const ConfigSchema = z
         if (config.debug)
           console.debug('Switching to CPU for GPU not supported.');
         config.device = 'cpu';
-      } else {
-        switch (config.model) {
-          case 'isnet':
-            break;
-          case 'isnet_fp16':
-          case 'isnet_quint8':
-            if (config.debug) console.debug('Switching to f32 model for GPU');
-            config.model = 'isnet';
-            break;
-        }
       }
     }
-
     return config;
   });