Skip to content

Commit

Permalink
add method for enhance pass,test=develop
Browse files Browse the repository at this point in the history
  • Loading branch information
winter-wang committed May 20, 2021
1 parent 6f8de31 commit 4847b6d
Show file tree
Hide file tree
Showing 4 changed files with 607 additions and 0 deletions.
2 changes: 2 additions & 0 deletions paddle/fluid/framework/ir/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ if (WITH_TESTING)
endif(WITH_TESTING)
cc_library(graph_pattern_detector SRCS graph_pattern_detector.cc DEPS ${GRAPH_PATTERN_DETECTOR_DEPS})

cc_library(op_compat_sensible_pass SRCS op_compat_sensible_pass.cc DEPS graph_pattern_detector)
cc_library(subgraph_detector SRCS subgraph_detector.cc DEPS graph_pattern_detector executor)
cc_library(fuse_pass_base SRCS fuse_pass_base.cc DEPS pass)
cc_library(placement_pass_base SRCS placement_pass_base.cc DEPS pass)
Expand Down Expand Up @@ -139,6 +140,7 @@ cc_test(graph_test SRCS graph_test.cc DEPS graph graph_helper op_registry)
cc_test(graph_helper_test SRCS graph_helper_test.cc DEPS graph graph_helper op_registry)
cc_test(graph_to_program_pass_test SRCS graph_to_program_pass_test.cc DEPS graph_to_program_pass)
cc_test(test_graph_pattern_detector SRCS graph_pattern_detector_tester.cc DEPS graph_pattern_detector)
cc_test(test_op_compat_sensible_pass SRCS op_compat_sensible_pass_tester.cc DEPS op_compat_sensible_pass)
cc_test(test_fc_fuse_pass_cc SRCS fc_fuse_pass_tester.cc DEPS fc_fuse_pass framework_proto)
cc_test(test_fc_lstm_fuse_pass_cc SRCS fc_lstm_fuse_pass_tester.cc DEPS fc_lstm_fuse_pass framework_proto)
cc_test(test_fc_gru_fuse_pass_cc SRCS fc_gru_fuse_pass_tester.cc DEPS fc_gru_fuse_pass framework_proto)
Expand Down
178 changes: 178 additions & 0 deletions paddle/fluid/framework/ir/op_compat_sensible_pass.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
/* 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 <memory>

#include "paddle/fluid/framework/ir/op_compat_sensible_pass.h"

namespace paddle {
namespace framework {
namespace ir {

AttrCompat& AttrCompat::IsStringIn(const std::set<std::string>& candidates) {
conditions_.emplace_back([candidates](const Attribute& attr) -> bool {
std::string value = BOOST_GET_CONST(std::string, attr);
for (auto& str : candidates) {
if (str == value) {
return true;
}
}
return false;
});
return *this;
}

AttrCompat& AttrCompat::IsStringMatch(
const std::function<bool(const std::string&)>& func) {
conditions_.emplace_back([func](const Attribute& attr) -> bool {
std::string value = BOOST_GET_CONST(std::string, attr);
return func(value);
});
return *this;
}

AttrCompat& AttrCompat::IsIntIn(const std::set<int>& candidates) {
conditions_.emplace_back([candidates](const Attribute& attr) -> bool {
int value = BOOST_GET_CONST(int, attr);
return candidates.find(value) != candidates.end();
});
return *this;
}

//! Todo: append the definition.
AttrCompat& AttrCompat::IsLeftDefault() { return *this; }

bool AttrCompat::operator()(const OpDesc& op_desc) {
if (!op_desc.HasAttr(attr_name_)) {
return false;
}
const Attribute attr = op_desc.GetAttr(attr_name_);
for (auto& func : conditions_) {
if (!func(attr)) {
return false;
}
}
return true;
}

AttrCompat& AttrCompat::IsBoolEQ(bool v) {
conditions_.emplace_back([v](const Attribute& attr) -> bool {
bool value = BOOST_GET_CONST(bool, attr);
return value == v;
});
return *this;
}

InputOrOutputCompat& InputOrOutputCompat::IsTensor() {
conditions_.emplace_back([](const std::vector<std::string>& input) -> bool {
return input.size() == 1u;
});
return *this;
}

InputOrOutputCompat& InputOrOutputCompat::IsOptional() {
optional_ = true;
return *this;
}

bool InputOrOutputCompat::operator()(
const std::vector<std::string>& input) const {
if (input.empty()) return false;
for (auto& func : conditions_) {
if (!func(input)) {
return false;
}
}
return true;
}

AttrCompat& OpCompat::AddAttr(const std::string& attr_name) {
attr_compats_.emplace_back(attr_name, this);
return attr_compats_.back();
}

InputOrOutputCompat& OpCompat::AddInput(const std::string& name) {
PADDLE_ENFORCE_EQ(input_compats_.find(name), input_compats_.end(),
platform::errors::InvalidArgument(
"The input with the same name has been added"));
input_compats_.emplace(name, InputOrOutputCompat(name, this));
return input_compats_.at(name);
}

InputOrOutputCompat& OpCompat::AddOutput(const std::string& name) {
PADDLE_ENFORCE_EQ(output_compats_.find(name), output_compats_.end(),
platform::errors::InvalidArgument(
"The output with the same name has been added"));
output_compats_.emplace(name, InputOrOutputCompat(name, this));
return output_compats_.at(name);
}

bool OpCompat::Judge(const OpDesc& op_desc) {
for (auto& attr_compat : attr_compats_) {
if (!attr_compat(op_desc)) {
return false;
}
}

const VariableNameMap& inputs_map = op_desc.Inputs();
for (auto& input_desc : inputs_map) {
if (input_compats_.find(input_desc.first) == input_compats_.end()) {
if (!input_desc.second.empty()) {
return false;
}
}
}
for (auto& input_val : input_compats_) {
if (inputs_map.find(input_val.first) == inputs_map.end()) {
if (!input_val.second.Optional()) {
return false;
}
} else {
if (!input_val.second(inputs_map.at(input_val.first))) {
return false;
}
}
}

const VariableNameMap& outputs_map = op_desc.Outputs();
for (auto& output_desc : outputs_map) {
if (output_compats_.find(output_desc.first) == output_compats_.end()) {
if (!output_desc.second.empty()) {
return false;
}
}
}
for (auto& output_val : output_compats_) {
if (outputs_map.find(output_val.first) == outputs_map.end()) {
if (!output_val.second.Optional()) {
return false;
}
} else {
if (!output_val.second(outputs_map.at(output_val.first))) {
return false;
}
}
}
return true;
}

OpCompat& OpCompatSensiblePass::AddOpCompat(OpCompat&& op_compat) {
std::string name = op_compat.Name();
op_compat_judgers_[name].reset(new OpCompat(std::move(op_compat)));
return *(op_compat_judgers_[name]);
}

} // namespace ir
} // namespace framework
} // namespace paddle
Loading

1 comment on commit 4847b6d

@paddle-bot-old
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Congratulation! Your pull request passed all required CI. You could ask reviewer(s) to approve and merge. 🎉

Please sign in to comment.