Skip to content

webgpu: Upgrade tfjs-core dependency. #2038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
annxingyuan merged 5 commits into from
Sep 13, 2019
Merged

webgpu: Upgrade tfjs-core dependency. #2038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2c4f83
upgrade dep
annxingyuan Sep 13, 2019
1a0e649
exclude test
annxingyuan Sep 13, 2019
164c1f1
use imports
annxingyuan Sep 13, 2019
b240e3a
oops
annxingyuan Sep 13, 2019
b163f85
Merge branch 'master' into upgrade_webgpu_dep
annxingyuan Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tfjs-backend-webgpu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@tensorflow/tfjs-core": "1.2.8",
"@tensorflow/tfjs-core": "1.2.9",
"@types/jasmine": "~2.5.53",
"clang-format": "~1.2.2",
"http-server": "~0.10.0",
Expand Down Expand Up @@ -48,6 +48,6 @@
"@webgpu/types": "0.0.6"
},
"peerDependencies": {
"@tensorflow/tfjs-core": "1.2.1"
"@tensorflow/tfjs-core": "1.2.9"
}
}
21 changes: 4 additions & 17 deletions tfjs-backend-webgpu/src/backend_webgpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import './flags_webgpu';

import {backend_util, DataMover, DataType, ENV, KernelBackend, Rank, ShapeMap, Tensor, Tensor2D, Tensor3D, Tensor4D, TimingInfo, util} from '@tensorflow/tfjs-core';
import {backend_util, DataMover, DataType, ENV, KernelBackend, Rank, RecursiveArray, ShapeMap, Tensor, Tensor2D, Tensor3D, Tensor4D, TimingInfo, util} from '@tensorflow/tfjs-core';
import * as shaderc from '@webgpu/shaderc';

import {BufferManager} from './buffer_manager';
Expand All @@ -41,21 +41,7 @@ import {UnaryOpProgram} from './kernels/unary_op_webgpu';
import * as webgpu_program from './kernels/webgpu_program';
import {WebGPUBinary} from './kernels/webgpu_program';

// START TO-IMPORT-FROM-CORE ============================
// TODO(annyuan): Delete definitions in this section and import from core once
// new release is published.
type MemoryInfo = {
numTensors: number; numDataBuffers: number; numBytes: number;
unreliable?: boolean; reasons: string[];
};

// tslint:disable-next-line:no-any
interface RecursiveArray<T extends any> {
[index: number]: T|RecursiveArray<T>;
}
// END TO-IMPORT-FROM-CORE ==============================

export interface WebGPUMemoryInfo extends MemoryInfo {
export interface WebGPUMemoryInfo extends backend_util.MemoryInfo {
numBytesInGPU: number;
unreliable: boolean;
}
Expand Down Expand Up @@ -462,7 +448,8 @@ export class WebGPUBackend extends KernelBackend {
const uniformInfo = {
byteSize: uniformData.byteLength,
usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.UNIFORM,
buffer: uniforms.resource.buffer};
buffer: uniforms.resource.buffer
};
this.disposalQueue.push(uniformInfo);

if (ENV.get('WEBGPU_IMMEDIATE_EXECUTION_ENABLED')) {
Expand Down
6 changes: 2 additions & 4 deletions tfjs-backend-webgpu/src/backend_webgpu_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ describeWebGPU('backend webgpu', () => {
tf.matMul(c, f);
const freeBuffersAfterFirstMatMul = bufferManager.getNumFreeBuffers();
const usedBuffersAfterFirstMatMul = bufferManager.getNumUsedBuffers();
expect(freeBuffersAfterFirstMatMul - freeBuffersAfterFirstMul)
.toEqual(0);
expect(freeBuffersAfterFirstMatMul - freeBuffersAfterFirstMul).toEqual(0);
expect(usedBuffersAfterFirstMatMul - usedBuffersAfterFirstMul).toEqual(3);

const a2 = tf.tensor2d([2, 4, 6, 8], [2, 2]);
Expand All @@ -148,8 +147,7 @@ describeWebGPU('backend webgpu', () => {
const c2 = tf.mul(a2, b2);
const freeBuffersAfterSecondMul = bufferManager.getNumFreeBuffers();
const usedBuffersAfterSecondMul = bufferManager.getNumUsedBuffers();
expect(freeBuffersAfterSecondMul - freeBuffersAfterFirstMatMul)
.toEqual(0);
expect(freeBuffersAfterSecondMul - freeBuffersAfterFirstMatMul).toEqual(0);
expect(usedBuffersAfterSecondMul - usedBuffersAfterFirstMatMul).toEqual(4);

const f2 = tf.tensor2d([1, 2, 3, 4, 5, 6], [2, 3]);
Expand Down
1 change: 0 additions & 1 deletion tfjs-backend-webgpu/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {WebGPUBackend} from './backend_webgpu';

tf.registerBackend('webgpu', async () => {
const shaderc = await Shaderc.instantiate();
// @ts-ignore navigator.gpu is required
const adapter = await navigator.gpu.requestAdapter({});
const device = await adapter.requestDevice({});
return new WebGPUBackend(device, shaderc);
Expand Down
4 changes: 3 additions & 1 deletion tfjs-backend-webgpu/src/setup_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ const EXCLUDE_LIST: string[] = [
'RFFT', // Not yet implemented.
'fused', // Not yet implemented.
'NCHW', // Not yet implemented.
'maxPool3d' // Not yet implemented.
'maxPool3d', // Not yet implemented.
'frame', // Not yet implemented.
'HTMLVideolement'
];

/**
Expand Down
8 changes: 4 additions & 4 deletions tfjs-backend-webgpu/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
esutils "^2.0.2"
js-tokens "^4.0.0"

"@tensorflow/[email protected].8":
version "1.2.8"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.2.8.tgz#d6873b88522f8cf25d34c10afd095866578d7d92"
integrity sha512-lWV4vAnXAAmahXpCWBwdGGW9HO6iNw9pUeVYih7pDXeJahMk3OJs6SgjRNhwn+ldsGwRoorR0/RHg0yNLmqWxQ==
"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.2.9.tgz#125830270a0bdd0e856914778a300c4ad6f51e21"
integrity sha512-s0hHZSx6rGTlkkB8u8gs5n7sIPv1GXDNHmISRy+kqGzmlpkfI2kr6WXqOWQy6wFgjzopRD8cJQjBZ9USPZnYTQ==
dependencies:
"@types/offscreencanvas" "~2019.3.0"
"@types/seedrandom" "2.4.27"
Expand Down