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.

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

Rename pooling ops #8111

Merged
merged 42 commits into from
May 1, 2022
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1e47f38
refine_pooling_grad_kernels
Flowingsun007 Apr 7, 2022
8d6293a
optimize pooling grad kernels
Flowingsun007 Apr 7, 2022
4b7ab7c
optimize
Flowingsun007 Apr 8, 2022
1a26046
Merge branch 'master' into dev_optimize_pooling_grad
Flowingsun007 Apr 8, 2022
3c0931f
refine
Flowingsun007 Apr 8, 2022
a4abd36
Merge branch 'dev_optimize_pooling_grad' of github.com:Oneflow-Inc/on…
Flowingsun007 Apr 8, 2022
9888a80
Merge branch 'master' into dev_optimize_pooling_grad
Flowingsun007 Apr 8, 2022
51e53cb
Merge branch 'master' into dev_optimize_pooling_grad
Flowingsun007 Apr 11, 2022
9bf55db
auto format by CI
oneflow-ci-bot Apr 11, 2022
6351062
Merge branch 'master' into dev_optimize_pooling_grad
Flowingsun007 Apr 11, 2022
4e1098d
rename pooling ops
Flowingsun007 Apr 11, 2022
6d095ca
merge
Flowingsun007 Apr 28, 2022
7244b48
refine
Flowingsun007 Apr 28, 2022
ef51f14
refine
Flowingsun007 Apr 28, 2022
2c0a45c
refine
Flowingsun007 Apr 28, 2022
7e72637
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 28, 2022
590e4f5
rename
Flowingsun007 Apr 28, 2022
8dee8f5
rename
Flowingsun007 Apr 28, 2022
7962f9a
rename
Flowingsun007 Apr 28, 2022
d097302
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 28, 2022
8ebf65c
refine
Flowingsun007 Apr 28, 2022
8208b1e
Merge branch 'rename_pooling_ops' of github.com:Oneflow-Inc/oneflow i…
Flowingsun007 Apr 28, 2022
501826c
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 28, 2022
de24f45
auto format by CI
oneflow-ci-bot Apr 28, 2022
2064f1b
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 28, 2022
a2aecda
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
81239ce
fix clang check
Flowingsun007 Apr 29, 2022
39aaa55
auto format by CI
oneflow-ci-bot Apr 29, 2022
3ef748b
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
bf93426
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
110f505
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
6b77198
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
a852deb
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 29, 2022
d47e6d9
Merge branch 'master' into rename_pooling_ops
Flowingsun007 Apr 30, 2022
1824582
refine
Flowingsun007 Apr 30, 2022
bca27fd
auto format by CI
oneflow-ci-bot Apr 30, 2022
00ec669
Merge branch 'master' into rename_pooling_ops
mergify[bot] Apr 30, 2022
9eb5f2c
Merge branch 'master' into rename_pooling_ops
mergify[bot] Apr 30, 2022
754fa31
Merge branch 'master' into rename_pooling_ops
mergify[bot] Apr 30, 2022
79e3d54
refine
Flowingsun007 Apr 30, 2022
6de2a6d
fix
Flowingsun007 May 1, 2022
f4e8fdc
Merge branch 'master' into rename_pooling_ops
mergify[bot] May 1, 2022
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
Prev Previous commit
Next Next commit
refine
Flowingsun007 committed Apr 8, 2022
commit 3c0931fbf54045d849dc2bafce646f6926746aa7
3 changes: 0 additions & 3 deletions oneflow/ir/include/OneFlow/OneFlowBase.td
Original file line number Diff line number Diff line change
@@ -183,7 +183,6 @@ class OneFlow_TFPoolGradBaseOp<string mnemonic, list<Trait> traits = []> :
let summary = "OneFlow pooling grad operation, align with TensorFlow";
let input = (ins
AnyType:$x,
AnyType:$y,
AnyType:$dy
);
let output = (outs AnyType:$dx);
@@ -257,7 +256,6 @@ class OneFlow_MaxPoolGradBaseOp<string mnemonic, list<Trait> traits = []> :
let summary = "OneFlow Max Pooling Grad operation";
let input = (ins
AnyType:$x,
AnyType:$y,
AnyType:$indice,
AnyType:$dy
);
@@ -284,7 +282,6 @@ class OneFlow_AvgPoolGradBaseOp<string mnemonic, list<Trait> traits = []> :
let summary = "OneFlow Average Pooling Grad operation";
let input = (ins
AnyType:$x,
AnyType:$y,
AnyType:$dy
);
let output = (outs
1 change: 1 addition & 0 deletions oneflow/user/ops/pool_op.cpp
Original file line number Diff line number Diff line change
@@ -93,6 +93,7 @@ GenBackwardOpConfFn MakeGenBackwardOpConfFn(const std::string& mode, const int32
user_op::UserOpConfWrapperBuilder builder(op.op_name() + "_grad");
user_op::UserOpConfWrapper grad_op =
builder.Op(mode + "_pool_" + std::to_string(dim) + "d_grad")
.Input("x", op.input("x", 0))
.Input("dy", op.GetGradTensorWithOpOutput("y", 0))
.Output("dx")
.Attr("data_format", op.attr<std::string>("data_format"))
2 changes: 2 additions & 0 deletions oneflow/user/ops/pooling_op.cpp
Original file line number Diff line number Diff line change
@@ -143,6 +143,7 @@ GenBackwardOpConfFn MaxPoolMakeBackwardOpConfFn(const std::string& mode, const i
user_op::UserOpConfWrapperBuilder builder(op.op_name() + "_grad");
user_op::UserOpConfWrapper grad_op =
builder.Op(mode + "pool_" + std::to_string(dim) + "d_grad")
.Input("x", op.input("x", 0))
.Input("indice", op.output("indice", 0))
.Input("dy", op.GetGradTensorWithOpOutput("y", 0))
.Output("dx")
@@ -167,6 +168,7 @@ GenBackwardOpConfFn AvgPoolMakeBackwardOpConfFn(const int32_t dim) {
user_op::UserOpConfWrapperBuilder builder(op.op_name() + "_grad");
user_op::UserOpConfWrapper grad_op =
builder.Op("avgpool_" + std::to_string(dim) + "d_grad")
.Input("x", op.input("x", 0))
.Input("dy", op.GetGradTensorWithOpOutput("y", 0))
.Output("dx")
.Attr("data_format", op.attr<std::string>("data_format"))