From dd66e894b0aacabda57ac5b01f1c8bc0492aa757 Mon Sep 17 00:00:00 2001 From: Ken Zhou Date: Wed, 21 May 2025 20:46:54 -0400 Subject: [PATCH 1/3] fix `ort-wasm-simd-threaded.mjs` not being bundled into `ort.wasm.bundle.min.mjs` as it is for other `bundle.min.mjs` builds --- js/web/script/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/web/script/build.ts b/js/web/script/build.ts index 6a9432c2b5acd..df9071e5241ee 100644 --- a/js/web/script/build.ts +++ b/js/web/script/build.ts @@ -644,7 +644,7 @@ async function main() { isProduction: true, outputName: 'ort.wasm.bundle', format: 'esm', - define: { ...DEFAULT_DEFINE, 'BUILD_DEFS.DISABLE_JSEP': 'true', 'BUILD_DEFS.DISABLE_WEBGL': 'true' }, + define: { ...DEFAULT_DEFINE, 'BUILD_DEFS.DISABLE_JSEP': 'true', 'BUILD_DEFS.DISABLE_WEBGL': 'true', 'BUILD_DEFS.ENABLE_BUNDLE_WASM_JS': 'true' }, }); // ort.webgl[.min].[m]js await addAllWebBuildTasks({ From 8d330beaa853ae7aa7d9fab0f2c8f30bb21b76f4 Mon Sep 17 00:00:00 2001 From: Ken Zhou Date: Mon, 26 May 2025 12:41:26 -0400 Subject: [PATCH 2/3] format `js/web/script/build.ts` --- js/web/script/build.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/web/script/build.ts b/js/web/script/build.ts index df9071e5241ee..2ea883f739c52 100644 --- a/js/web/script/build.ts +++ b/js/web/script/build.ts @@ -644,7 +644,12 @@ async function main() { isProduction: true, outputName: 'ort.wasm.bundle', format: 'esm', - define: { ...DEFAULT_DEFINE, 'BUILD_DEFS.DISABLE_JSEP': 'true', 'BUILD_DEFS.DISABLE_WEBGL': 'true', 'BUILD_DEFS.ENABLE_BUNDLE_WASM_JS': 'true' }, + define: { + ...DEFAULT_DEFINE, + 'BUILD_DEFS.DISABLE_JSEP': 'true', + 'BUILD_DEFS.DISABLE_WEBGL': 'true', + 'BUILD_DEFS.ENABLE_BUNDLE_WASM_JS': 'true', + }, }); // ort.webgl[.min].[m]js await addAllWebBuildTasks({ From 119cb0ab74cfec9c0b681aeb2e0061a6a951a283 Mon Sep 17 00:00:00 2001 From: Ken Zhou Date: Tue, 27 May 2025 17:41:31 -0400 Subject: [PATCH 3/3] apply changes from "fix E2E test": https://github.com/fs-eire/onnxruntime/commit/4090fccb0c9b3e235649394f975eff339174c0c5 --- js/web/test/e2e/src/cjs-js/main.js | 20 +++++++++++--------- js/web/test/e2e/src/esm-js/main.js | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/js/web/test/e2e/src/cjs-js/main.js b/js/web/test/e2e/src/cjs-js/main.js index c9b8d3e85455d..5eea342fdcae7 100644 --- a/js/web/test/e2e/src/cjs-js/main.js +++ b/js/web/test/e2e/src/cjs-js/main.js @@ -6,13 +6,15 @@ const ort = require('onnxruntime-web/wasm'); const { setupMultipleThreads, testInferenceAndValidate } = require('./shared'); -if (typeof SharedArrayBuffer === 'undefined') { - it('Browser package consuming test - single-thread - [js][commonjs]', async function () { - await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); - }); -} else { - it('Browser package consuming test - multi-thread - [js][commonjs]', async function () { - setupMultipleThreads(ort); - await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); - }); +if (typeof it !== 'undefined') { + if (typeof SharedArrayBuffer === 'undefined') { + it('Browser package consuming test - single-thread - [js][commonjs]', async function () { + await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); + }); + } else { + it('Browser package consuming test - multi-thread - [js][commonjs]', async function () { + setupMultipleThreads(ort); + await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); + }); + } } diff --git a/js/web/test/e2e/src/esm-js/main.js b/js/web/test/e2e/src/esm-js/main.js index 7687b8b731878..54744a2a4b16f 100644 --- a/js/web/test/e2e/src/esm-js/main.js +++ b/js/web/test/e2e/src/esm-js/main.js @@ -6,13 +6,15 @@ import * as ort from 'onnxruntime-web/wasm'; import { setupMultipleThreads, default as testInferenceAndValidate } from './shared.js'; -if (typeof SharedArrayBuffer === 'undefined') { - it('Browser package consuming test - single-thread - [js][esm]', async function () { - await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); - }); -} else { - it('Browser package consuming test - multi-thread - [js][esm]', async function () { - setupMultipleThreads(ort); - await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); - }); +if (typeof it !== 'undefined') { + if (typeof SharedArrayBuffer === 'undefined') { + it('Browser package consuming test - single-thread - [js][esm]', async function () { + await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); + }); + } else { + it('Browser package consuming test - multi-thread - [js][esm]', async function () { + setupMultipleThreads(ort); + await testInferenceAndValidate(ort, { executionProviders: ['wasm'] }); + }); + } }