Revert 'auto' as default device for custom ort

huggingface · Dec 3, 2024 · 42ae1fe · 42ae1fe
1 parent 9994c75
commit 42ae1fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/backends/onnx.js b/src/backends/onnx.js
@@ -63,7 +63,6 @@ let ONNX;
 if (apis.IS_EXPOSED_RUNTIME_ENV) {
     // If the JS runtime exposes their own ONNX runtime, use it
     ONNX = globalThis[apis.EXPOSED_RUNTIME_SYMBOL];
-    defaultDevices = ['auto'];
 
 } else if (apis.IS_NODE_ENV) {
     ONNX = ONNX_NODE.default ?? ONNX_NODE;

diff --git a/src/models.js b/src/models.js
@@ -165,12 +165,12 @@ async function getSession(pretrained_model_name_or_path, fileName, options) {
     }
 
     // If the device is not specified, we use the default (supported) execution providers.
-    const selectedDevice = /** @type {import("./utils/devices.js").DeviceType} */(
-        device ?? (
-          apis.IS_EXPOSED_RUNTIME_ENV ? 'auto' : (
-            apis.IS_NODE_ENV ? 'cpu' : 'wasm'
-        ))
+    let selectedDevice = /** @type {import("./utils/devices.js").DeviceType} */ (
+      // Do not asign default device if 'IS_EXPOSED_RUNTIME_ENV'
+      device ?? (apis.IS_EXPOSED_RUNTIME_ENV ? undefined
+        : (apis.IS_NODE_ENV ? 'cpu' : 'wasm'))
     );
+
     const executionProviders = deviceToExecutionProviders(selectedDevice);
 
     // If options.dtype is specified, we use it to choose the suffix for the model file.
@@ -238,7 +238,7 @@ async function getSession(pretrained_model_name_or_path, fileName, options) {
     const free_dimension_overrides = custom_config.free_dimension_overrides;
     if (free_dimension_overrides) {
         session_options.freeDimensionOverrides ??= free_dimension_overrides;
-    } else if (selectedDevice.startsWith('webnn') && !session_options.freeDimensionOverrides) {
+    } else if (selectedDevice?.startsWith('webnn') && !session_options.freeDimensionOverrides) {
         console.warn(
             'WebNN does not currently support dynamic shapes and requires `free_dimension_overrides` to be set in config.json as a field within "transformers.js_config". ' +
             'When `free_dimension_overrides` is not set, you may experience significant performance degradation.'