Skip to content
This repository was archived by the owner on Aug 15, 2019. It is now read-only.

Commit f184337

Browse files
authored
[webgpu] Update types. (#1851)
FEATURE
1 parent 29c48ac commit f184337

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

tfjs-webgpu/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
},
4343
"dependencies": {
4444
"@webgpu/shaderc": "0.0.6",
45-
"@webgpu/types": "0.0.3"
45+
"@webgpu/types": "0.0.6"
4646
},
4747
"peerDependencies": {
4848
"@tensorflow/tfjs-core": "1.2.1"
4949
}
50-
}
50+
}

tfjs-webgpu/src/backend_webgpu.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ type TensorInfo = {
6666

6767
interface DataId {}
6868

69-
const DEFAULT_GPUBUFFER_USAGE = GPUBufferUsage.STORAGE |
70-
GPUBufferUsage.TRANSFER_SRC | GPUBufferUsage.TRANSFER_DST;
69+
const DEFAULT_GPUBUFFER_USAGE =
70+
GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST;
7171

7272
export class WebGPUBackend extends KernelBackend {
7373
device: GPUDevice;
@@ -191,7 +191,7 @@ export class WebGPUBackend extends KernelBackend {
191191
private async getBufferData(info: TensorInfo): Promise<ArrayBuffer> {
192192
const staging = this.acquireBuffer(
193193
info.bufferInfo.byteSize,
194-
GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.MAP_READ);
194+
GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ);
195195
const encoder = this.device.createCommandEncoder({});
196196
encoder.copyBufferToBuffer(
197197
info.bufferInfo.buffer, 0, staging, 0, info.bufferInfo.byteSize);
@@ -204,7 +204,7 @@ export class WebGPUBackend extends KernelBackend {
204204
staging.unmap();
205205
this.releaseBuffer(
206206
staging, info.bufferInfo.byteSize,
207-
GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.MAP_READ);
207+
GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ);
208208

209209
return values;
210210
}
@@ -369,14 +369,14 @@ export class WebGPUBackend extends KernelBackend {
369369
}
370370
this.releaseBuffer(
371371
uniforms.resource.buffer, uniformData.byteLength,
372-
GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.UNIFORM);
372+
GPUBufferUsage.COPY_DST | GPUBufferUsage.UNIFORM);
373373
return output as {} as K;
374374
}
375375

376376
private makeUniforms(data: Uint32Array|
377377
Int32Array): webgpu_program.BindingInfo {
378378
const dimensionsBuffer = this.acquireBuffer(
379-
data.byteLength, GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.UNIFORM);
379+
data.byteLength, GPUBufferUsage.COPY_DST | GPUBufferUsage.UNIFORM);
380380
dimensionsBuffer.setSubData(0, data);
381381

382382
return {

tfjs-webgpu/src/kernels/webgpu_program.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ const makeBindGroupLayout =
7070
(device: GPUDevice, inputs: shader_preprocessor.InputInfo[], output: Tensor,
7171
uniforms?: BindingInfo): GPUBindGroupLayout => {
7272
const bindings = Array(1 + inputs.length).fill({
73-
visibility: GPUShaderStageBit.COMPUTE,
73+
visibility: GPUShaderStage.COMPUTE,
7474
type: 'storage-buffer' as GPUBindingType
7575
});
7676
if (uniforms) {
7777
bindings.push({
78-
visibility: GPUShaderStageBit.COMPUTE,
78+
visibility: GPUShaderStage.COMPUTE,
7979
type: 'uniform-buffer' as GPUBindingType
8080
});
8181
}

tfjs-webgpu/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
resolved "https://registry.yarnpkg.com/@webgpu/shaderc/-/shaderc-0.0.6.tgz#832df2684f3a5b15ad0924049aa55f82ea043020"
5151
integrity sha512-GTOPB0j47XCjcGoPGhO0cIwlIO6kGT0fkLZrkm69XSYfBuMFi/ozSsZF9VFBnQG5o2sANt/lH+KZ2+YqcV94qA==
5252

53-
"@webgpu/types@0.0.3":
54-
version "0.0.3"
55-
resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.0.3.tgz#3b7989fab7fbc50bfa201fa46708927518fa3ece"
56-
integrity sha512-2LXPgHQwpjHQsHTuooOuL88vMkZaCgHaQ1EayZbDsQgMM/q78Me1QMSyZDs542DEiu6YcILKBbkFNruSmVGE7A==
53+
"@webgpu/types@0.0.6":
54+
version "0.0.6"
55+
resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.0.6.tgz#c012d4e6a6a1571e0cb6d16e055cfc4791dee16b"
56+
integrity sha512-KZMqX8VjcKXXlEB1Ws//Qh9P7boHAx+eMD1+ic47JLlPN3Iz5EXw0elGZk/pERlVVXGCNGYo3zhObWhgyxKBSw==
5757

5858
abbrev@1:
5959
version "1.1.1"

0 commit comments

Comments
 (0)