Skip to content

Commit

Permalink
Fixed lint error and addressed comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Honry committed Mar 18, 2024
1 parent 17400ce commit 2606b19
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
12 changes: 6 additions & 6 deletions nsnet2/nsnet2.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ export class NSNet2 {
const [gru94, gru93] = this.builder_.gru(transpose31, weight192, recurrentWeight193, frames, this.hiddenSize,
{bias: bias194, recurrentBias: recurrentBias194, initialHiddenState: initialState92, returnSequence: true});
// Use reshape to implement squeeze(gru93, {axes: [1]});
const squeezed95_shape = gru93.shape();
squeezed95_shape.splice(1, 1);
const squeeze95 = this.builder_.reshape(gru93, squeezed95_shape);
const squeeze95Shape = gru93.shape();
squeeze95Shape.splice(1, 1);
const squeeze95 = this.builder_.reshape(gru93, squeeze95Shape);
const initialState155 = this.builder_.input('initialState155', {
type: 'float32',
dataType: 'float32',
Expand All @@ -62,9 +62,9 @@ export class NSNet2 {
const [gru157, gru156] = this.builder_.gru(squeeze95, weight212, recurrentWeight213, frames, this.hiddenSize,
{bias: bias214, recurrentBias: recurrentBias214, initialHiddenState: initialState155, returnSequence: true});
// Use reshape to implement squeeze(gru156, {axes: [1]});
const squeeze158_shape = gru156.shape();
squeeze158_shape.splice(1, 1);
const squeeze158 = this.builder_.reshape(gru156, squeeze158_shape);
const squeeze158Shape = gru156.shape();
squeeze158Shape.splice(1, 1);
const squeeze158 = this.builder_.reshape(gru156, squeeze158Shape);
const transpose159 = this.builder_.transpose(squeeze158, {permutation: [1, 0, 2]});
const relu163 = this.builder_.relu(this.builder_.add(this.builder_.matmul(transpose159, weight215), biasFcOut0));
const relu167 = this.builder_.relu(this.builder_.add(this.builder_.matmul(relu163, weight216), biasFcOut2));
Expand Down
12 changes: 5 additions & 7 deletions style_transfer/fast_style_transfer_net.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ export class FastStyleTransferNet {
buildInstanceNormalization_(conv2D, variableMul, variableAdd) {
if ('instanceNormalization' in this.builder_) {
// Use reshape to implement squeeze(variableMul); and squeeze(variableAdd);
const mul_shape = variableMul.shape();
const add_shape = variableAdd.shape();
const squeezed_mul_shape = mul_shape.filter(dim => dim !==1);
const squeezed_add_shape = add_shape.filter(dim => dim !==1);
const mul_squeeze = this.builder_.reshape(variableMul, squeezed_mul_shape);
const add_squeeze = this.builder_.reshape(variableAdd, squeezed_add_shape);
return this.builder_.instanceNormalization(conv2D, {scale: mul_squeeze, bias: add_squeeze});
const mulShape = variableMul.shape().filter((dim) => dim !==1);
const addShape = variableAdd.shape().filter((dim) => dim !==1);
const mulSqueeze = this.builder_.reshape(variableMul, mulShape);
const addSqueeze = this.builder_.reshape(variableAdd, addShape);
return this.builder_.instanceNormalization(conv2D, {scale: mulSqueeze, bias: addSqueeze});
} else {
const sub = this.builder_.sub(conv2D, this.builder_.reduceMean(conv2D, {axes: [2, 3], keepDimensions: true}));
const reduceMean = this.builder_.reduceMean(this.builder_.mul(sub, sub), {axes: [2, 3], keepDimensions: true});
Expand Down

0 comments on commit 2606b19

Please sign in to comment.