Skip to content
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

Jump to bottom

Fix BroadcastMatmulGrad bug #6168

Merged
merged 6 commits into from
Sep 6, 2021
Merged

Fix BroadcastMatmulGrad bug #6168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8af9d4
fix(BroadcastMatmulGrad): fix BroadcastMatmulGrad bug
wyg1997 Sep 6, 2021
c3be827
remove useless code
wyg1997 Sep 6, 2021
9a5cd1e
Merge remote-tracking branch 'origin/master' into fix-broadcast_matmu…
wyg1997 Sep 6, 2021
90594a7
Merge branch 'master' into fix-broadcast_matmul_grad_bug
oneflow-ci-bot Sep 6, 2021
e446d89
Merge branch 'master' into fix-broadcast_matmul_grad_bug
wyg1997 Sep 6, 2021
f22ff30
Merge remote-tracking branch 'origin/master' into fix-broadcast_matmu…
wyg1997 Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 38 additions & 1 deletion oneflow/core/autograd/gradient_funcs/matmul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,46 @@ Maybe<void> Matmul::Apply(const MatmulCaptureState* ctx, const TensorTuple& out_
return Maybe<void>::Ok();
}

class BroadcastMatmul : public Matmul {
public:
Maybe<void> Apply(const MatmulCaptureState* ctx, const TensorTuple& out_grads,
TensorTuple* in_grads) const override;
};

Maybe<void> BroadcastMatmul::Apply(const MatmulCaptureState* ctx, const TensorTuple& out_grads,
TensorTuple* in_grads) const {
if (!ctx->requires_grad_a && !ctx->requires_grad_b) { return Maybe<void>::Ok(); }
CHECK_EQ_OR_RETURN(out_grads.size(), 1);

in_grads->resize(2);
if (ctx->requires_grad_a) {
const auto& input_b = ctx->SavedTensors().at(ctx->b_index);
if (ctx->transpose_a) {
in_grads->at(0) =
JUST(functional::MatMul(input_b, out_grads.at(0), ctx->transpose_b, true, ctx->alpha));
} else {
in_grads->at(0) = JUST(
functional::MatMul(out_grads.at(0), input_b, false, !(ctx->transpose_b), ctx->alpha));
}
}

if (ctx->requires_grad_b) {
const auto& input_a = ctx->SavedTensors().at(ctx->a_index);
if (ctx->transpose_b) {
in_grads->at(1) =
JUST(functional::BroadcastMatmulGradB(out_grads.at(0), input_a, ctx->alpha));
} else {
in_grads->at(1) =
JUST(functional::BroadcastMatmulGradB(input_a, out_grads.at(0), ctx->alpha));
}
}

return Maybe<void>::Ok();
}

REGISTER_OP_EXPR_GRAD_FUNCTION("matmul", Matmul);
REGISTER_OP_EXPR_GRAD_FUNCTION("batch_matmul", Matmul);
REGISTER_OP_EXPR_GRAD_FUNCTION("broadcast_matmul", Matmul);
REGISTER_OP_EXPR_GRAD_FUNCTION("broadcast_matmul", BroadcastMatmul);

} // namespace one
} // namespace oneflow
2 changes: 0 additions & 2 deletions oneflow/core/autograd/gradient_funcs/transpose.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ Maybe<void> Transpose::Apply(const TransposeCaptureState* ctx, const TensorTuple
TensorTuple* in_grads) const {
if (!ctx->requires_grad) { return Maybe<void>::Ok(); }
CHECK_EQ_OR_RETURN(out_grads.size(), 1);
MutableAttrMap attrs;
std::vector<int32_t> grad_perm;
grad_perm.resize(ctx->perm.size());
FOR_RANGE(int32_t, i, 0, ctx->perm.size()) { grad_perm.at(ctx->perm.at(i)) = i; }
JUST(attrs.SetAttr<std::vector<int32_t>>("perm", grad_perm));
in_grads->at(0) = JUST(functional::Transpose(out_grads.at(0), grad_perm));
return Maybe<void>::Ok();
}
Expand Down