Skip to content

[webgpu] Fix conv2d padding issue #2993

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
merged 4 commits into from
Apr 18, 2020
Merged

[webgpu] Fix conv2d padding issue #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed8ad46
[webgpu] Fix conv2d padding issue
haoyunfeix Mar 26, 2020
bb5d7e9
Merge branch 'master' into fix_conv2d_padding
haoyunfeix Apr 2, 2020
540bb2d
Merge branch 'master' into fix_conv2d_padding
haoyunfeix Apr 14, 2020
e210649
Merge branch 'master' into fix_conv2d_padding
annxingyuan Apr 18, 2020
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
18 changes: 2 additions & 16 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 @@ -726,14 +726,7 @@ export class WebGPUBackend extends KernelBackend {
program = new Conv2DMMProgram(convInfo, workPerThread);
}

const pad = convInfo.padInfo.type === 'VALID' ?
[0, 0] :
convInfo.padInfo.type === 'SAME' ?
[
-Math.floor((convInfo.filterShape[0] - 1) / 2),
-Math.floor((convInfo.filterShape[1] - 1) / 2)
] :
[convInfo.padInfo.top, convInfo.padInfo.left];
const pad = [convInfo.padInfo.top, convInfo.padInfo.left];

const dimensions = [
convInfo.filterHeight, convInfo.filterWidth, ...pad,
Expand Down Expand Up @@ -799,14 +792,7 @@ export class WebGPUBackend extends KernelBackend {
hasPreluActivationWeights);
}

const pad = convInfo.padInfo.type === 'VALID' ?
[0, 0] :
convInfo.padInfo.type === 'SAME' ?
[
-Math.floor((convInfo.filterShape[0] - 1) / 2),
-Math.floor((convInfo.filterShape[1] - 1) / 2)
] :
[convInfo.padInfo.top, convInfo.padInfo.left];
const pad = [convInfo.padInfo.top, convInfo.padInfo.left];

const dimensions = [
convInfo.filterHeight, convInfo.filterWidth, ...pad,
Expand Down
4 changes: 2 additions & 2 deletions tfjs-backend-webgpu/src/kernels/conv2d_mm_webgpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ export class Conv2DMMProgram implements WebGPUProgram {

ivec4 coord = ivec4(
batch,
pad[0] + outRow * stride[0] + dilation[0] * WRow,
pad[1] + outCol * stride[1] + dilation[1] * WCol,
outRow * stride[0] + dilation[0] * WRow - pad[0],
outCol * stride[1] + dilation[1] * WCol - pad[1],
c % xShape[3]);
return ${sampleA};
}
Expand Down