Skip to content

Fine-tune packed BackpropInput #7386

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
Feb 17, 2023
Merged

Fine-tune packed BackpropInput #7386

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
dcf35cd
Fine-tune packed BackpropInput
Linchenn Feb 16, 2023
61f2435
lint
Linchenn Feb 16, 2023
baa201a
Merge branch 'master' into impBackprop
qjia7 Feb 17, 2023
d27c3cd
Merge branch 'master' into impBackprop
Linchenn Feb 17, 2023
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
17 changes: 7 additions & 10 deletions tfjs-backend-webgl/src/conv_backprop_gpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,13 @@ export class Conv2DDerFilterProgram implements GPGPUProgram {
continue;
}

if (${isChannelsLast}) {
float dyValue = getDy(b, yR, yC, d2);
float xValue = getX(b, xR, xC, d1);
dotProd += (xValue * dyValue);
} else {
float dyValue = getDy(b, d2, yR, yC);
float xValue = getX(b, d1, xR, xC);
dotProd += (xValue * dyValue);
}

${isChannelsLast?
`float dyValue = getDy(b, yR, yC, d2);
float xValue = getX(b, xR, xC, d1);
dotProd += (xValue * dyValue);` :
`float dyValue = getDy(b, d2, yR, yC);
float xValue = getX(b, d1, xR, xC);
dotProd += (xValue * dyValue);`}
}
}
}
Expand Down
64 changes: 39 additions & 25 deletions tfjs-backend-webgl/src/conv_backprop_packed_gpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,36 +64,50 @@ export class Conv2DDerInputPackedProgram implements GPGPUProgram {
int wCPerm = ${filterWidth} - 1 - wC;

float dyC = float(dyCCorner + wC) / strides[1];
float idyCVal = dyC < 0.0 ? 0. :
dyC >= ${convInfo.outWidth}.0 ? 0. :
fract(dyC) > 0.0 ? 0. : 1.;
bool idyCVal = (dyC >= 0.0) && (dyC < ${convInfo.outWidth}.0)
&& (fract(dyC) == 0.0);
int idyC = int(dyC);

float dyC2 = float(dyCCorner + wC + 1) / strides[1];
float idyCVal2 = dyC2 < 0.0 ? 0. :
dyC2 >= ${convInfo.outWidth}.0 ? 0. :
fract(dyC2) > 0.0 ? 0. : 1.;
bool idyCVal2 = (dyC2 >= 0.0) && (dyC2 < ${convInfo.outWidth}.0)
&& (fract(dyC2) == 0.0);
int idyC2 = int(dyC2);

if (idyCVal + idyCVal2 == 0.) {
continue;
}

for (int d2 = 0; d2 < ${convInfo.outChannels}; d2 += 2) {
vec4 wValue = getW(wRPerm, wCPerm, d1, d2);
vec4 dySample = getDy(batch, idyR, idyC, d2);
vec4 dySample2 = (idyC / 2 == idyC2 / 2) ?
dySample : getDy(batch, idyR, idyC2, d2);

vec2 dyValue = mod(float(idyC), 2.) == 0. ?
dySample.xy : dySample.zw;
result.xy += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw)) * idyCVal;

dyValue = mod(float(idyC2), 2.) == 0. ?
dySample2.xy : dySample2.zw;
result.zw += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw)) * idyCVal2;
if (idyCVal && idyCVal2) {
for (int d2 = 0; d2 < ${convInfo.outChannels}; d2 += 2) {
vec4 wValue = getW(wRPerm, wCPerm, d1, d2);
vec4 dySample = getDy(batch, idyR, idyC, d2);
vec4 dySample2 = (idyC / 2 == idyC2 / 2) ?
dySample : getDy(batch, idyR, idyC2, d2);

vec2 dyValue = mod(float(idyC), 2.) == 0. ?
dySample.xy : dySample.zw;
result.xy += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw));

dyValue = mod(float(idyC2), 2.) == 0. ?
dySample2.xy : dySample2.zw;
result.zw += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw));
}
} else if (idyCVal) {
for (int d2 = 0; d2 < ${convInfo.outChannels}; d2 += 2) {
vec4 wValue = getW(wRPerm, wCPerm, d1, d2);
vec4 dySample = getDy(batch, idyR, idyC, d2);
vec2 dyValue = mod(float(idyC), 2.) == 0. ?
dySample.xy : dySample.zw;
result.xy += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw));
}
} else if (idyCVal2) {
for (int d2 = 0; d2 < ${convInfo.outChannels}; d2 += 2) {
vec4 wValue = getW(wRPerm, wCPerm, d1, d2);
vec4 dySample = getDy(batch, idyR, idyC2, d2);
vec2 dyValue = mod(float(idyC2), 2.) == 0. ?
dySample.xy : dySample.zw;
result.zw += vec2(dot(dyValue, wValue.xy),
dot(dyValue, wValue.zw));
}
}
}
}
Expand Down