diff --git a/js/web/karma.conf.js b/js/web/karma.conf.js index ae1303451f..a11c8c581f 100644 --- a/js/web/karma.conf.js +++ b/js/web/karma.conf.js @@ -91,12 +91,12 @@ module.exports = function (config) { listenAddress, customLaunchers: { ChromeTest: { - base: 'ChromeHeadless', + base: 'Chrome', flags: ['--enable-features=SharedArrayBuffer'] }, - ChromePerf: { - base: 'Chrome', - flags: ['--window-size=1,1', '--enable-features=SharedArrayBuffer'] + ChromeTestHeadless: { + base: 'ChromeHeadless', + flags: ['--enable-features=SharedArrayBuffer'] }, ChromeDebug: { debug: true, @@ -105,38 +105,33 @@ module.exports = function (config) { ChromeCanaryTest: { base: 'ChromeCanary', flags: [ - '--window-size=1,1', '--enable-features=SharedArrayBuffer', - '--enable-unsafe-webgpu', '--enable-experimental-web-platform-features' ] }, - ChromeCanaryProfileTest: { - base: 'ChromeCanary', - flags: [ - '--window-size=1,1', - '--enable-features=SharedArrayBuffer', - '--enable-unsafe-webgpu', - '--disable-dawn-features=disallow_unsafe_apis' - ] - }, ChromeCanaryDebug: { debug: true, base: 'ChromeCanary', flags: [ '--remote-debugging-port=9333', '--enable-features=SharedArrayBuffer', - '--enable-unsafe-webgpu', '--enable-experimental-web-platform-features' ] }, - ChromeCanaryProfileDebug: { + ChromeWebGpuProfileTest: { + base: 'Chrome', + flags: [ + '--window-size=1,1', + '--enable-features=SharedArrayBuffer', + '--disable-dawn-features=disallow_unsafe_apis' + ] + }, + ChromeWebGpuProfileDebug: { debug: true, - base: 'ChromeCanary', + base: 'Chrome', flags: [ '--remote-debugging-port=9333', '--enable-features=SharedArrayBuffer', - '--enable-unsafe-webgpu', '--disable-dawn-features=disallow_unsafe_apis', ] }, diff --git a/js/web/script/test-runner-cli-args.ts b/js/web/script/test-runner-cli-args.ts index c0ced63be6..e1cc5891f0 100644 --- a/js/web/script/test-runner-cli-args.ts +++ b/js/web/script/test-runner-cli-args.ts @@ -362,10 +362,14 @@ export function parseTestRunnerCliArgs(cmdlineArgs: string[]): TestRunnerCliArgs // Option: -b=<...>, --backend=<...> const browserBackends = ['webgl', 'webgpu', 'wasm', 'xnnpack', 'webnn']; - // TODO: remove this when Chrome support WebGPU or WebNN. - // we need this for now because Chrome does not support webgpu and webnn yet, + // TODO: remove this when Chrome support WebNN. + // we need this for now because Chrome does not support webnn yet, // and ChromeCanary is not in CI. - const defaultBrowserBackends = ['webgl', /* 'webgpu', */ 'wasm', 'xnnpack' /*, 'webnn'*/]; + + // TODO: web CI is still using chrome v112, where WebGPU is not available yet. + // re-enable webgpu after CI upgraded chrome to v113. + // const defaultBrowserBackends = ['webgl', 'webgpu', 'wasm', 'xnnpack' /*, 'webnn'*/]; + const defaultBrowserBackends = ['webgl' /*, 'webgpu' */, 'wasm', 'xnnpack' /*, 'webnn'*/]; const nodejsBackends = ['cpu', 'wasm']; const backendArgs = args.backend || args.b; const backend = (typeof backendArgs !== 'string') ? (env === 'node' ? nodejsBackends : defaultBrowserBackends) : diff --git a/js/web/script/test-runner-cli.ts b/js/web/script/test-runner-cli.ts index 90eb32ddad..5776f6b906 100644 --- a/js/web/script/test-runner-cli.ts +++ b/js/web/script/test-runner-cli.ts @@ -593,9 +593,9 @@ async function main() { if (webgpu) { switch (mode) { case 'debug': - return profile ? 'ChromeCanaryProfileDebug' : 'ChromeCanaryDebug'; + return profile ? 'ChromeWebGpuProfileDebug' : 'ChromeDebug'; default: - return profile ? 'ChromeCanaryProfileTest' : 'ChromeCanaryDebug'; + return profile ? 'ChromeWebGpuProfileTest' : 'ChromeTest'; } } else if (webnn) { switch (mode) { @@ -609,9 +609,9 @@ async function main() { case 'debug': return 'ChromeDebug'; case 'perf': - return 'ChromePerf'; - default: return 'ChromeTest'; + default: + return 'ChromeTestHeadless'; } } }