-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add reshape+transpose+matmul_v2 only (#37847)
* reshape+transpose+matmul_v2 * in_name->input_name * fix pr-ci-static-check
- Loading branch information
Showing
18 changed files
with
591 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_v2_mkldnn_fuse_pass.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #include "paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_v2_mkldnn_fuse_pass.h" | ||
| #include <string> | ||
| #include <unordered_set> | ||
| #include <vector> | ||
| #include "paddle/fluid/framework/op_version_registry.h" | ||
| #include "paddle/fluid/platform/enforce.h" | ||
| #include "paddle/fluid/string/pretty_log.h" | ||
|
|
||
| namespace paddle { | ||
| namespace framework { | ||
| namespace ir { | ||
|
|
||
| ReshapeTransposeMatmulV2MkldnnFusePass:: | ||
| ReshapeTransposeMatmulV2MkldnnFusePass() { | ||
| op_name_ = "matmul_v2"; | ||
|
|
||
| AddOpCompat(OpCompat("reshape2")) | ||
| .AddInput("X") | ||
| .IsTensor() | ||
| .End() | ||
| // The reshape2 op for this pass should not have "Shape" and "ShapeTensor" | ||
| .AddOutput("Out") | ||
| .IsTensor() | ||
| .End() | ||
| .AddOutput("XShape") | ||
| .IsOptional() | ||
| .IsTensor() | ||
| .End() | ||
| .AddAttr("shape") | ||
| .IsType<std::vector<int>>() | ||
| .End(); | ||
|
|
||
| AddOpCompat(OpCompat("transpose2")) | ||
| .AddInput("X") | ||
| .IsTensor() | ||
| .End() | ||
| .AddOutput("Out") | ||
| .IsTensor() | ||
| .End() | ||
| .AddOutput("XShape") | ||
| .IsOptional() | ||
| .IsTensor() | ||
| .End() | ||
| .AddAttr("axis") | ||
| .IsType<std::vector<int>>() | ||
| .End(); | ||
|
|
||
| AddOpCompat(OpCompat(op_name_)) | ||
| .AddInput("X") | ||
| .IsTensor() | ||
| .End() | ||
| .AddInput("Y") | ||
| .IsTensor() | ||
| .End() | ||
| .AddOutput("Out") | ||
| .IsTensor() | ||
| .End() | ||
| .AddAttr("trans_x") | ||
| .IsType<bool>() | ||
| .End() | ||
| .AddAttr("trans_y") | ||
| .IsType<bool>() | ||
| .End(); | ||
| } | ||
| } // namespace ir | ||
| } // namespace framework | ||
| } // namespace paddle | ||
|
|
||
| REGISTER_PASS(reshape_transpose_matmul_v2_mkldnn_fuse_pass, | ||
| paddle::framework::ir::ReshapeTransposeMatmulV2MkldnnFusePass); | ||
|
|
||
| REGISTER_PASS_CAPABILITY(reshape_transpose_matmul_v2_mkldnn_fuse_pass) | ||
| .AddCombination( | ||
| paddle::framework::compatible::OpVersionComparatorCombination() | ||
| .EQ("matmul_v2", 0) | ||
| .EQ("transpose2", 0) | ||
| .EQ("reshape2", 0)); |
39 changes: 39 additions & 0 deletions
39
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_v2_mkldnn_fuse_pass.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
|
|
||
| #include "paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.h" | ||
|
|
||
| namespace paddle { | ||
| namespace framework { | ||
| namespace ir { | ||
| /* | ||
| * Fuse Reshape->Transpose->MatMulV2 when MatMulV2 uses mkldnn. | ||
| */ | ||
|
|
||
| class ReshapeTransposeMatmulV2MkldnnFusePass | ||
| : public ReshapeTransposeMatmulMkldnnFusePass { | ||
| public: | ||
| ReshapeTransposeMatmulV2MkldnnFusePass(); | ||
| virtual ~ReshapeTransposeMatmulV2MkldnnFusePass() {} | ||
|
|
||
| protected: | ||
| const std::string name_scope_{"reshape_transpose_matmul_v2_fuse"}; | ||
| }; | ||
| } // namespace ir | ||
| } // namespace framework | ||
| } // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.