[js/webgpu] Prefer adapter.info to adapter.requestAdapterInfo

Yang Gu · Yang Gu · commit 2a70ffd5a9ee · 2024-06-18T13:00:42.000+08:00
WebGPU is deprecating async adapter.requestAdapterInfo, and replacing it with sync adapter.info. Spec change: gpuweb/gpuweb#4662
diff --git a/js/web/lib/wasm/jsep/backend-webgpu.ts b/js/web/lib/wasm/jsep/backend-webgpu.ts
@@ -233,7 +233,7 @@ export class WebGpuBackend {
     }
 
     this.device = await adapter.requestDevice(deviceDescriptor);
-    this.adapterInfo = new AdapterInfoImpl(await adapter.requestAdapterInfo());
+    this.adapterInfo = new AdapterInfoImpl(adapter.info || await adapter.requestAdapterInfo());
     this.gpuDataManager = createGpuDataManager(this);
     this.programManager = new ProgramManager(this);
     this.kernels = new Map();
diff --git a/js/web/package-lock.json b/js/web/package-lock.json
diff --git a/js/web/package.json b/js/web/package.json
@@ -43,7 +43,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/minimist": "^1.2.2",
     "@types/platform": "^1.3.4",
-    "@webgpu/types": "^0.1.38",
+    "@webgpu/types": "^0.1.42",
     "base64-js": "^1.5.1",
     "chai": "^4.3.7",
     "electron": "^28.1.4",

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ export class WebGpuBackend {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`this.device = await adapter.requestDevice(deviceDescriptor);`
`236`		`- this.adapterInfo = new AdapterInfoImpl(await adapter.requestAdapterInfo());`
	`236`	`+ this.adapterInfo = new AdapterInfoImpl(adapter.info \|\| await adapter.requestAdapterInfo());`
`237`	`237`	`this.gpuDataManager = createGpuDataManager(this);`
`238`	`238`	`this.programManager = new ProgramManager(this);`
`239`	`239`	`this.kernels = new Map();`