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

EliminatePad and PadFusion support Pad12 positive indexes #18278

Merged
merged 10 commits into from
Jul 5, 2023
Merged

EliminatePad and PadFusion support Pad12 positive indexes #18278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4eabbdd
update opset5::Pad -> PadBase
evkotov Jun 28, 2023
e6fb6fb
rewrite unit tests
evkotov Jun 28, 2023
a2726bb
refactor unit tests
evkotov Jun 29, 2023
9a6df1d
add unit test NegativePadElimination
evkotov Jun 29, 2023
5bdd448
fix add destructor
evkotov Jun 29, 2023
5d8b4df
clang fixes
evkotov Jun 29, 2023
a342639
fix unit tests
evkotov Jun 29, 2023
5cc44fa
add unit tests
evkotov Jun 29, 2023
8e17a07
bug fix
evkotov Jun 29, 2023
712ed3e
Merge branch 'master' into pad12_pad_fusion
itikhono Jul 5, 2023
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
3 changes: 2 additions & 1 deletion src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <ngraph/util.hpp>
#include <numeric>
#include <openvino/core/validation_util.hpp>
#include <openvino/op/util/pad_base.hpp>
#include <openvino/opsets/opset3.hpp>
#include <openvino/opsets/opset7.hpp>
#include <openvino/opsets/opset8.hpp>
Expand Down Expand Up @@ -315,7 +316,7 @@ SIMPLE_MATCHER_PASS_DEFINITION(EliminateGather, simplify_gather, opset3::Gather,

pass::EliminatePad::EliminatePad() {
MATCHER_SCOPE(EliminatePad);
auto pad_node_pattern = pattern::wrap_type<opset8::Pad>();
auto pad_node_pattern = pattern::wrap_type<op::util::PadBase>();

matcher_pass_callback callback = [=](pattern::Matcher& m) {
auto pad = m.get_match_root();
Expand Down
34 changes: 18 additions & 16 deletions src/common/transformations/src/transformations/common_optimizations/pad_fusion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <ngraph/pattern/op/wrap_type.hpp>
#include <ngraph/rt_info.hpp>
#include <ngraph/validation_util.hpp>
#include <openvino/op/util/pad_base.hpp>
#include <openvino/opsets/opset5.hpp>
#include <vector>

Expand All @@ -17,7 +18,7 @@
using namespace ov;

template <typename T>
static bool can_be_fused(const std::shared_ptr<opset5::Pad>& pad,
static bool can_be_fused(const std::shared_ptr<op::util::PadBase>& pad,
const std::shared_ptr<T>& node,
const std::shared_ptr<Node>& pad_value_node,
const std::shared_ptr<opset5::Constant>& pads_begin,
Expand Down Expand Up @@ -96,14 +97,14 @@ pass::PadFusionAvgPool::PadFusionAvgPool() {
auto pads_end_pattern = pattern::wrap_type<opset5::Constant>();
auto pad_value_pattern = pattern::any_input();
auto pad_node_pattern =
pattern::wrap_type<opset5::Pad>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
pattern::wrap_type<op::util::PadBase>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
Copy link
Contributor

@itikhono itikhono Jul 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

just a note, no changes from your side required: I hope the check on line 58 (pad_fusion.cpp) should already detect the negative pad values

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you. I noticed that before PR creation

pattern::consumers_count(1));
auto avg_pool_pattern = pattern::wrap_type<opset5::AvgPool>({pad_node_pattern});

matcher_pass_callback callback = [=](pattern::Matcher& m) {
auto pattern_map = m.get_pattern_value_map();
auto data = pattern_map[data_pattern];
auto pad = std::dynamic_pointer_cast<opset5::Pad>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad = std::dynamic_pointer_cast<op::util::PadBase>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad_value = pattern_map[pad_value_pattern].get_node_shared_ptr();
auto pads_begin =
std::dynamic_pointer_cast<opset5::Constant>(pattern_map[pads_begin_pattern].get_node_shared_ptr());
Expand Down Expand Up @@ -196,15 +197,16 @@ pass::PadFusionConvolution::PadFusionConvolution() {
auto pads_end_pattern = pattern::wrap_type<opset5::Constant>();
auto pad_value_pattern = pattern::any_input();
auto pad_node_pattern =
pattern::wrap_type<opset5::Pad>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
pattern::wrap_type<op::util::PadBase>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
auto conv_pattern = pattern::wrap_type<opset5::Convolution>({pad_node_pattern, filter_pattern});

matcher_pass_callback callback = [=](pattern::Matcher& m) {
std::cout << "[EMUTEX DEBUG] CHECKPOINT PadFusionConvolution" << std::endl;
auto pattern_map = m.get_pattern_value_map();
auto data = pattern_map[data_pattern];
auto filter = pattern_map[filter_pattern];
auto pad = std::dynamic_pointer_cast<opset5::Pad>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad = std::dynamic_pointer_cast<op::util::PadBase>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad_value = pattern_map[pad_value_pattern].get_node_shared_ptr();
auto pads_begin =
std::dynamic_pointer_cast<opset5::Constant>(pattern_map[pads_begin_pattern].get_node_shared_ptr());
Expand Down Expand Up @@ -243,15 +245,15 @@ pass::PadFusionConvolutionBackpropData::PadFusionConvolutionBackpropData() {
auto pads_end_pattern = pattern::wrap_type<opset5::Constant>();
auto pad_value_pattern = pattern::any_input();
auto pad_node_pattern =
pattern::wrap_type<opset5::Pad>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
pattern::wrap_type<op::util::PadBase>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
auto conv_pattern = pattern::wrap_type<opset5::ConvolutionBackpropData>({pad_node_pattern, filter_pattern});

matcher_pass_callback callback = [=](pattern::Matcher& m) {
auto pattern_map = m.get_pattern_value_map();
auto data = pattern_map[data_pattern];
auto filter = pattern_map[filter_pattern];
auto pad = std::dynamic_pointer_cast<opset5::Pad>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad = std::dynamic_pointer_cast<op::util::PadBase>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad_value = pattern_map[pad_value_pattern].get_node_shared_ptr();
auto pads_begin =
std::dynamic_pointer_cast<opset5::Constant>(pattern_map[pads_begin_pattern].get_node_shared_ptr());
Expand Down Expand Up @@ -301,15 +303,15 @@ pass::PadFusionGroupConvolution::PadFusionGroupConvolution() {
auto pads_end_pattern = pattern::wrap_type<opset5::Constant>();
auto pad_value_pattern = pattern::any_input();
auto pad_node_pattern =
pattern::wrap_type<opset5::Pad>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
pattern::wrap_type<op::util::PadBase>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
auto conv_pattern = pattern::wrap_type<opset5::GroupConvolution>({pad_node_pattern, filter_pattern});

matcher_pass_callback callback = [=](pattern::Matcher& m) {
auto pattern_map = m.get_pattern_value_map();
auto data = pattern_map[data_pattern];
auto filter = pattern_map[filter_pattern];
auto pad = std::dynamic_pointer_cast<opset5::Pad>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad = std::dynamic_pointer_cast<op::util::PadBase>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad_value = pattern_map[pad_value_pattern].get_node_shared_ptr();
auto pads_begin =
std::dynamic_pointer_cast<opset5::Constant>(pattern_map[pads_begin_pattern].get_node_shared_ptr());
Expand Down Expand Up @@ -349,15 +351,15 @@ pass::PadFusionGroupConvolutionBackpropData::PadFusionGroupConvolutionBackpropDa
auto pads_end_pattern = pattern::wrap_type<opset5::Constant>();
auto pad_value_pattern = pattern::any_input();
auto pad_node_pattern =
pattern::wrap_type<opset5::Pad>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
pattern::wrap_type<op::util::PadBase>({data_pattern, pads_begin_pattern, pads_end_pattern, pad_value_pattern},
pattern::consumers_count(1));
auto conv_pattern = pattern::wrap_type<opset5::GroupConvolutionBackpropData>({pad_node_pattern, filter_pattern});

matcher_pass_callback callback = [=](pattern::Matcher& m) {
auto pattern_map = m.get_pattern_value_map();
auto data = pattern_map[data_pattern];
auto filter = pattern_map[filter_pattern];
auto pad = std::dynamic_pointer_cast<opset5::Pad>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad = std::dynamic_pointer_cast<op::util::PadBase>(pattern_map[pad_node_pattern].get_node_shared_ptr());
auto pad_value = pattern_map[pad_value_pattern].get_node_shared_ptr();
auto pads_begin =
std::dynamic_pointer_cast<opset5::Constant>(pattern_map[pads_begin_pattern].get_node_shared_ptr());
Expand Down
Loading