[CC]Fix CC issue for transformation (#12292)

* Revert "Fixed 3 naming issue"

This reverts commit a92d3cfff5.

* Revert "Fix CC issues for transformation and snippets"

This reverts commit d08a3f5aac.

* Fix NGRAPH_PASS_CALLBACK issue to make it can work

* Fix matcher name missing issue
This commit is contained in:
River Li authored and GitHub committed 2022-07-27 16:17:53 +04:00
1 parent 361ca2078d
commit 0ef4ccb86f
198 files changed
+104 -309

No files matched your search

@@ -120,7 +120,6 @@ ngraph::pass::AddFakeQuantizeFusion::AddFakeQuantizeFusion() {
new_fq->set_friendly_name(fq->get_friendly_name());
copy_runtime_info({add_node, fq}, {new_input_low, new_input_high, new_fq});
replace_node(fq, new_fq);
MATCHER_SCOPE_ENABLE(AddFakeQuantizeFusion);
return true;
};
@@ -120,7 +120,7 @@ ngraph::pass::BatchToSpaceFusion::BatchToSpaceFusion() {
reshape_or_trans_after},
batch_to_space);
replace_node(reshape_or_trans_after, batch_to_space);
MATCHER_SCOPE_ENABLE(BatchToSpaceFusion);
return true;
};
@@ -199,7 +199,6 @@ pass::BinarizeWeights::BinarizeWeights() {
{new_activations_fq, new_conv, activations_norm_factor_reshaped, mul, weights_norm_factor_reshaped, mul2});
mul2->set_friendly_name(conv->get_friendly_name());
replace_node(conv, mul2);
MATCHER_SCOPE_ENABLE(BinarizeWeights);
return true;
};
@@ -64,7 +64,7 @@ ngraph::pass::ClampFusion::ClampFusion() {
copy_runtime_info(nodes, clamp);
replace_node(root_node, clamp);
MATCHER_SCOPE_ENABLE(ClampFusion);
return true;
};
@@ -78,7 +78,7 @@ ov::pass::CompressFloatConstantsImpl::CompressFloatConstantsImpl() {
ov::mark_as_decompression(convert);
ov::replace_node(const_node, convert);
MATCHER_SCOPE_ENABLE(CompressFloatConstantsImpl);
return true;
};
@@ -69,7 +69,6 @@ ngraph::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() {
new_eltwise->set_friendly_name(squeeze->get_friendly_name());
ngraph::copy_runtime_info({eltwise, squeeze}, new_eltwise);
ngraph::replace_node(squeeze, new_eltwise);
MATCHER_SCOPE_ENABLE(PullSqueezeThroughEltwise);
return true;
};
@@ -73,7 +73,6 @@ ngraph::pass::ConvolutionMultiplyFusion::ConvolutionMultiplyFusion() {
new_conv->set_friendly_name(m_mul->get_friendly_name());
copy_runtime_info({m_conv, m_mul}, {new_conv, final_const.get_node_shared_ptr(), weights_multiply});
replace_node(m_mul, new_conv);
MATCHER_SCOPE_ENABLE(ConvolutionMultiplyFusion);
return true;
};
@@ -161,7 +160,7 @@ ngraph::pass::GroupConvolutionMultiplyFusion::GroupConvolutionMultiplyFusion() {
m_conv->set_friendly_name(m_mul->get_friendly_name());
m_mul->output(0).replace(m_conv->output(0));
copy_runtime_info(m_mul, {m_conv, new_weights});
MATCHER_SCOPE_ENABLE(GroupConvolutionMultiplyFusion);
return true;
};
@@ -228,7 +227,6 @@ ngraph::pass::ConvolutionBackpropDataMultiplyFusion::ConvolutionBackpropDataMult
new_conv->set_friendly_name(m_mul->get_friendly_name());
copy_runtime_info({m_conv, m_mul}, {new_conv, final_const.get_node_shared_ptr(), weights_multiply});
replace_node(m_mul, new_conv);
MATCHER_SCOPE_ENABLE(ConvolutionBackpropDataMultiplyFusion);
return true;
};
@@ -297,7 +295,6 @@ ngraph::pass::GroupConvolutionBackpropDataMultiplyFusion::GroupConvolutionBackpr
new_conv->set_friendly_name(m_mul->get_friendly_name());
copy_runtime_info({m_conv, m_mul}, {new_conv, final_const.get_node_shared_ptr(), weights_multiply});
replace_node(m_mul, new_conv);
MATCHER_SCOPE_ENABLE(GroupConvolutionBackpropDataMultiplyFusion);
return true;
};
@@ -117,7 +117,7 @@ ngraph::pass::ConvToBinaryConv::ConvToBinaryConv() {
auto mul = std::make_shared<opset5::Multiply>(add, op::Constant::create(element::f32, Shape{}, {0.5}));
copy_runtime_info(conv, {new_conv, add, mul});
replace_node(conv, mul);
MATCHER_SCOPE_ENABLE(ConvToBinaryConv);
return true;
}
@@ -21,7 +21,6 @@ ov::pass::EnableDecompressionConvertConstantFolding::EnableDecompressionConvertC
if (!ov::is_decompression(node))
return false;
enable_constant_folding(node);
MATCHER_SCOPE_ENABLE(EnableDecompressionConvertConstantFolding);
return true;
};
@@ -33,7 +33,6 @@ public:
for (const auto& out_node : out_nodes) {
ov::set_nms_selected_indices(out_node.get_node());
}
MATCHER_SCOPE_ENABLE(InitNMSPath);
return true;
};
auto m = make_shared<pattern::Matcher>(nms_pattern, matcher_name);
@@ -59,7 +58,6 @@ public:
auto node = m.get_match_root();
const auto& inputs = node->input_values();
if (any_of(inputs.begin(), inputs.end(), [](const Output<Node>& output) {
MATCHER_SCOPE_ENABLE(PropagateNMSPath);
return ov::has_nms_selected_indices(output.get_node());
})) {
ov::set_nms_selected_indices(node.get());
@@ -92,7 +90,6 @@ public:
gather->input(1).replace_source_output(new_convert_to_unsigned);
copy_runtime_info(gather, new_convert_to_unsigned);
}
MATCHER_SCOPE_ENABLE(UpdateConvertGather);
return true;
};
auto m = make_shared<pattern::Matcher>(node_pattern, matcher_name);
@@ -170,7 +170,7 @@ ngraph::pass::ConvertQuantizeDequantize::ConvertQuantizeDequantize() {
copy_runtime_info({fq, convert1.get_node_shared_ptr(), convert2.get_node_shared_ptr()}, new_fq);
replace_node(mul, new_fq);
MATCHER_SCOPE_ENABLE(ConvertQuantizeDequantize);
return true;
};
@@ -194,7 +194,6 @@ ngraph::pass::DepthToSpaceFusion::DepthToSpaceFusion() {
depth_to_space->set_friendly_name(reshape_after->get_friendly_name());
ngraph::copy_runtime_info({reshape_before, permute, reshape_after}, depth_to_space);
ngraph::replace_node(reshape_after, depth_to_space);
MATCHER_SCOPE_ENABLE(DepthToSpaceFusion);
return true;
};
@@ -89,7 +89,7 @@ ngraph::pass::DilatedConvolutionConverter::DilatedConvolutionConverter() {
},
new_conv);
replace_node(batch_to_space, new_conv);
MATCHER_SCOPE_ENABLE(DilatedConvolutionConverter);
return true;
};
@@ -37,7 +37,6 @@ ngraph::pass::DivideFusion::DivideFusion() {
div->set_friendly_name(mul->get_friendly_name());
copy_runtime_info({mul, pow}, div);
replace_node(mul, div);
MATCHER_SCOPE_ENABLE(DivideFusion);
return true;
};
@@ -71,7 +71,6 @@ ov::pass::DivisionByZeroFP16Resolver::DivisionByZeroFP16Resolver() {
normalized_fp16_min);
copy_runtime_info(eps_const, new_constant);
replace_node(eps_const, new_constant);
MATCHER_SCOPE_ENABLE(DivisionByZeroFP16Resolver);
return true;
};
@@ -71,7 +71,7 @@ ngraph::pass::DropoutWithRandomUniformReplacer::DropoutWithRandomUniformReplacer
broadcast->set_friendly_name(ru->get_friendly_name());
copy_runtime_info(ru, broadcast);
ngraph::replace_node(ru, broadcast);
MATCHER_SCOPE_ENABLE(DropoutWithRandomUniformReplacer);
return true;
};
@@ -54,11 +54,11 @@ ngraph::pass::EliminateUnsqueezeGather::EliminateUnsqueezeGather() {
ngraph::copy_runtime_info(m_gather.get_node_shared_ptr(), m_unsqueeze.get_node_shared_ptr());
m_gather.replace(m_unsqueezeInput);
MATCHER_SCOPE_ENABLE(EliminateUnsqueezeGather);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(gather, "EliminateUnsqueezeGather");
auto m = std::make_shared<ngraph::pattern::Matcher>(gather, matcher_name);
register_matcher(m, callback);
}
@@ -91,10 +91,9 @@ ngraph::pass::EliminateGatherUnsqueeze::EliminateGatherUnsqueeze() {
new_gather->set_friendly_name(gather->get_friendly_name());
ngraph::copy_runtime_info({unsqueeze, gather}, {new_gather, new_indices});
ngraph::replace_node(unsqueeze, new_gather);
MATCHER_SCOPE_ENABLE(EliminateGatherUnsqueeze);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(unsqueeze_label, "EliminateGatherUnsqueeze");
auto m = std::make_shared<ngraph::pattern::Matcher>(unsqueeze_label, matcher_name);
register_matcher(m, callback);
}
@@ -53,7 +53,6 @@ ov::pass::FoldSubgraphEmptyInputs::FoldSubgraphEmptyInputs() {
const_empty_replacement);
}
multi_subgraph_op->set_arguments(multi_subgraph_op_inputs);
MATCHER_SCOPE_ENABLE(FoldSubgraphEmptyInputs);
return true;
}
return false;
@@ -142,7 +142,7 @@ ngraph::pass::FakeQuantizeMulFusion::FakeQuantizeMulFusion() {
new_fq_node->set_friendly_name(mul_node->get_friendly_name());
copy_runtime_info({fq_node, mul_node}, new_fq_node);
MATCHER_SCOPE_ENABLE(FakeQuantizeMulFusion);
return true;
};
@@ -77,7 +77,6 @@ ngraph::pass::FakeQuantizeReshapeFusion::FakeQuantizeReshapeFusion() {
replace_node(reshape_node, new_fq_node);
new_fq_node->set_friendly_name(reshape_node->get_friendly_name());
copy_runtime_info({fq_node, reshape_node}, new_fq_node);
MATCHER_SCOPE_ENABLE(FakeQuantizeReshapeFusion)
return true;
};
@@ -69,7 +69,6 @@ ngraph::pass::GeluFusionWithErfOne::GeluFusionWithErfOne() {
},
gelu);
ngraph::replace_node(m.get_match_root(), gelu);
MATCHER_SCOPE_ENABLE(GeluFusionWithErfOne)
return true;
};
@@ -129,7 +128,6 @@ ngraph::pass::GeluFusionWithErfTwo::GeluFusionWithErfTwo() {
},
gelu);
ngraph::replace_node(m.get_match_root(), gelu);
MATCHER_SCOPE_ENABLE(GeluFusionWithErfTwo);
return true;
};
@@ -189,7 +187,6 @@ ngraph::pass::GeluFusionWithErfThree::GeluFusionWithErfThree() {
},
gelu);
ngraph::replace_node(m.get_match_root(), gelu);
MATCHER_SCOPE_ENABLE(GeluFusionWithErfThree);
return true;
};
@@ -273,7 +270,6 @@ ngraph::pass::GeluFusionWithTanh::GeluFusionWithTanh() {
},
gelu);
ngraph::replace_node(m.get_match_root(), gelu);
MATCHER_SCOPE_ENABLE(GeluFusionWithTanh);
return true;
};
@@ -55,7 +55,6 @@ ngraph::pass::HSigmoidFusionWithReluDiv::HSigmoidFusionWithReluDiv() {
},
hsigmoid);
ngraph::replace_node(m.get_match_root(), hsigmoid);
MATCHER_SCOPE_ENABLE(HSigmoidFusionWithReluDiv);
return true;
};
@@ -103,7 +102,6 @@ ngraph::pass::HSigmoidFusionWithReluMul::HSigmoidFusionWithReluMul() {
pattern_to_output.at(mul_second).get_node_shared_ptr()},
hsigmoid);
ngraph::replace_node(m.get_match_root(), hsigmoid);
MATCHER_SCOPE_ENABLE(HSigmoidFusionWithReluMul);
return true;
};
@@ -156,7 +154,6 @@ ngraph::pass::HSigmoidFusionWithoutRelu::HSigmoidFusionWithoutRelu() {
pattern_to_output.at(div).get_node_shared_ptr()},
hsigmoid);
ngraph::replace_node(m.get_match_root(), hsigmoid);
MATCHER_SCOPE_ENABLE(HSigmoidFusionWithoutRelu);
return true;
};
@@ -203,7 +200,6 @@ ngraph::pass::HSigmoidFusionWithClampMul::HSigmoidFusionWithClampMul() {
pattern_to_output.at(mul_first).get_node_shared_ptr()},
hsigmoid);
ngraph::replace_node(m.get_match_root(), hsigmoid);
MATCHER_SCOPE_ENABLE(HSigmoidFusionWithClampMul);
return true;
};
@@ -250,7 +246,6 @@ ngraph::pass::HSigmoidFusionWithClampDiv::HSigmoidFusionWithClampDiv() {
pattern_to_output.at(div).get_node_shared_ptr()},
hsigmoid);
ngraph::replace_node(m.get_match_root(), hsigmoid);
MATCHER_SCOPE_ENABLE(HSigmoidFusionWithClampDiv);
return true;
};
@@ -60,7 +60,6 @@ ngraph::pass::HSwishFusionWithReluDiv::HSwishFusionWithReluDiv() {
},
hswish);
ngraph::replace_node(m.get_match_root(), hswish);
MATCHER_SCOPE_ENABLE(HSwishFusionWithReluDiv);
return true;
};
@@ -113,7 +112,6 @@ ngraph::pass::HSwishFusionWithReluMul::HSwishFusionWithReluMul() {
pattern_to_output.at(mul_second).get_node_shared_ptr()},
hswish);
ngraph::replace_node(m.get_match_root(), hswish);
MATCHER_SCOPE_ENABLE(HSwishFusionWithReluMul);
return true;
};
@@ -137,7 +135,6 @@ ngraph::pass::HSwishFusionWithHSigmoid::HSwishFusionWithHSigmoid() {
hswish->set_friendly_name(mul->get_friendly_name());
ngraph::copy_runtime_info({hsigmoid, mul}, hswish);
ngraph::replace_node(mul, hswish);
MATCHER_SCOPE_ENABLE(HSwishFusionWithHSigmoid);
return true;
};
@@ -180,7 +177,6 @@ ngraph::pass::HSwishFusionWithClamp::HSwishFusionWithClamp() {
pattern_to_output.at(mul).get_node_shared_ptr()},
{hswish, new_mul_const, new_mul});
ngraph::replace_node(m.get_match_root(), new_mul);
MATCHER_SCOPE_ENABLE(HSwishFusionWithClampMul);
return true;
};
@@ -225,7 +225,7 @@ ngraph::pass::InterpolateSequenceFusion::InterpolateSequenceFusion() {
new_interpolate->set_friendly_name(snd_interpolate->get_friendly_name());
copy_runtime_info({fst_interpolate, snd_interpolate}, new_subgraph);
replace_node(snd_interpolate, new_interpolate);
MATCHER_SCOPE_ENABLE(InterpolateSequenceFusion);
return true;
};
@@ -36,7 +36,7 @@ ngraph::pass::LeakyReluFusion::LeakyReluFusion() {
copy_runtime_info({pattern_map.at(multiply_pattern).get_node_shared_ptr(), maximum.get_node_shared_ptr()},
leaky_relu);
replace_node(maximum.get_node_shared_ptr(), leaky_relu);
MATCHER_SCOPE_ENABLE(LeakyReluFusion);
return true;
};
@@ -55,7 +55,6 @@ ngraph::pass::AddMultiplyFusion::AddMultiplyFusion() {
copy_runtime_info({add, mul}, {new_mul, new_add});
new_add->set_friendly_name(mul->get_friendly_name());
replace_node(mul, new_add);
MATCHER_SCOPE_ENABLE(AddMultiplyFusion);
return true;
};
@@ -90,7 +89,6 @@ ngraph::pass::AddAddFusion::AddAddFusion() {
copy_runtime_info({add1, add2}, new_add);
new_add->set_friendly_name(add2->get_friendly_name());
replace_node(add2, new_add);
MATCHER_SCOPE_ENABLE(AddAddFusion);
return true;
};
@@ -126,7 +124,6 @@ ngraph::pass::MultiplyMultiplyFusion::MultiplyMultiplyFusion() {
copy_runtime_info({mul1, mul2}, new_mul);
new_mul->set_friendly_name(mul2->get_friendly_name());
replace_node(mul2, new_mul);
MATCHER_SCOPE_ENABLE(MultiplyMultiplyFusion);
return true;
};
@@ -180,7 +180,7 @@ pass::MatMulMultiplyFusion::MatMulMultiplyFusion() {
register_new_node(new_mm);
copy_runtime_info({mul, weights.get_node_shared_ptr(), matmul}, {new_weights, new_mm});
replace_node(mul, new_mm);
MATCHER_SCOPE_ENABLE(MatMulMultiplyFusion);
return true;
};
@@ -35,7 +35,6 @@ ngraph::pass::MishFusion::MishFusion() {
pattern_to_output.at(exp).get_node_shared_ptr()},
mish);
ngraph::replace_node(m.get_match_root(), mish);
MATCHER_SCOPE_ENABLE(MishFusion);
return true;
};
@@ -58,7 +58,6 @@ ngraph::pass::MultiplyConvolutionFusion::MultiplyConvolutionFusion() {
new_conv->set_friendly_name(conv->get_friendly_name());
copy_runtime_info({conv, pattern_to_output.at(mul_pattern).get_node_shared_ptr()}, {new_weights, new_conv});
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(MultiplyConvolutionFusion);
return true;
};
@@ -124,7 +123,7 @@ ngraph::pass::MultiplyGroupConvolutionFusion::MultiplyGroupConvolutionFusion() {
new_conv->set_friendly_name(conv->get_friendly_name());
copy_runtime_info({conv, pattern_to_output.at(mul_pattern).get_node_shared_ptr()}, {new_weights, new_conv});
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(MultiplyGroupConvolutionFusion);
return true;
};
@@ -191,7 +190,7 @@ ngraph::pass::MultiplyConvolutionBackpropDataFusion::MultiplyConvolutionBackprop
new_conv->set_friendly_name(conv->get_friendly_name());
copy_runtime_info({conv, pattern_to_output.at(mul_pattern).get_node_shared_ptr()}, {new_weights, new_conv});
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(MultiplyConvolutionBackpropDataFusion);
return true;
};
@@ -261,7 +260,7 @@ ngraph::pass::MultiplyGroupConvolutionBackpropDataFusion::MultiplyGroupConvoluti
new_conv->set_friendly_name(conv->get_friendly_name());
copy_runtime_info({conv, pattern_to_output.at(mul_pattern).get_node_shared_ptr()}, {new_weights, new_conv});
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(MultiplyGroupConvolutionBackpropDataFusion);
return true;
};
@@ -116,7 +116,6 @@ ngraph::pass::MulFakeQuantizeFusion::MulFakeQuantizeFusion() {
{new_const, new_input_low, new_input_high, new_fq});
new_fq->set_friendly_name(fq->get_friendly_name());
replace_node(fq, new_fq);
MATCHER_SCOPE_ENABLE(MulFakeQuantizeFusion);
return true;
};
@@ -184,7 +184,6 @@ ngraph::pass::MVNFusionWithoutConstants::MVNFusionWithoutConstants() {
mvn->set_friendly_name(m.get_match_root()->get_friendly_name());
ngraph::copy_runtime_info(nodes_to_copy_info, mvn);
ngraph::replace_node(m.get_match_root(), mvn);
MATCHER_SCOPE_ENABLE(MVNFusionWithoutConstants);
return true;
};
@@ -300,7 +299,6 @@ ngraph::pass::MVNFusionWithConstantsInside::MVNFusionWithConstantsInside() {
{mvn, const_gamma_node, mul_gamma, const_beta_node, add_beta});
add_beta->set_friendly_name(m.get_match_root()->get_friendly_name());
ngraph::replace_node(m.get_match_root(), add_beta);
MATCHER_SCOPE_ENABLE(MVNFusionWithConstantsInside);
return true;
};
@@ -372,7 +372,7 @@ ngraph::pass::NearestNeighborUpsamplingFusion::NearestNeighborUpsamplingFusion()
{reshape_2_node, mul_node, mul_const_node, concat_1_node, concat_2_node, ss_before_concat_1, shapeof_node},
{scales_node, sizes_node, axes_node, interpolate});
replace_node(reshape_2_node, interpolate);
MATCHER_SCOPE_ENABLE(NearestNeighborUpsamplingFusion);
return true;
};
@@ -277,7 +277,6 @@ static bool eliminate_unsqueeze(const std::shared_ptr<Node>& node) {
MATCHER_SCOPE(NAME); \
auto match_node = ngraph::pattern::wrap_type<OP>(); \
ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { \
MATCHER_SCOPE_ENABLE(NAME); \
return FUNC(m.get_match_root()); \
}; \
auto m = std::make_shared<ngraph::pattern::Matcher>(match_node, matcher_name); \
@@ -317,7 +316,7 @@ pass::EliminatePad::EliminatePad() {
})) {
return false;
}
MATCHER_SCOPE_ENABLE(EliminatePad);
return replace_output_update_name(pad->output(0), pad->input_value(0));
};
@@ -335,7 +334,6 @@ pass::EliminateConvert::EliminateConvert() {
return false;
}
if (convert->get_input_element_type(0) == convert->get_element_type()) {
MATCHER_SCOPE_ENABLE(EliminateConvert);
return replace_output_update_name(convert->output(0), convert->input_value(0));
}
return false;
@@ -357,7 +355,6 @@ pass::EliminateConvertNonZero::EliminateConvertNonZero() {
convert->output(0).replace(convert->input_value(0));
// to make this elimination recursive we register NonZero as a node which will be used to repeat matching
register_new_node(m.get_match_root());
MATCHER_SCOPE_ENABLE(EliminateConvertNonZero);
return true;
};
@@ -372,7 +369,6 @@ pass::EliminateConcat::EliminateConcat() {
matcher_pass_callback callback = [](pattern::Matcher& m) {
auto concat = m.get_match_root();
if (concat->inputs().size() == 1) {
MATCHER_SCOPE_ENABLE(EliminateConcat);
return replace_output_update_name(concat->output(0), concat->input_value(0));
}
return false;
@@ -391,7 +387,6 @@ pass::EliminateSplit::EliminateSplit() {
if (!split || split->get_num_splits() != 1) {
return false;
}
MATCHER_SCOPE_ENABLE(EliminateSplit);
return replace_output_update_name(split->output(0), split->input_value(0));
};
@@ -404,7 +399,6 @@ pass::EliminateSqueeze::EliminateSqueeze() {
auto squeeze_pattern = pattern::wrap_type<opset8::Squeeze>();
matcher_pass_callback callback = [](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(EliminateSqueeze);
const auto node = m.get_match_root();
auto out_shape = node->get_output_partial_shape(0);
// try to replace all unsqueeze/squeeze with reshape
@@ -503,7 +497,6 @@ pass::EliminateTranspose::EliminateTranspose() {
}
auto transpose = m.get_match_root();
MATCHER_SCOPE_ENABLE(EliminateTranspose);
return replace_output_update_name(transpose->output(0), transpose->input_value(0));
};
@@ -527,7 +520,7 @@ pass::EliminateEltwise::EliminateEltwise() {
if (!op::util::can_eliminate_eltwise_node(eltwise, constant, non_const_input)) {
return false;
}
MATCHER_SCOPE_ENABLE(EliminateEltwise);
return replace_output_update_name(eltwise->output(0), non_const_input);
};
@@ -120,7 +120,6 @@ ngraph::pass::NormalizeL2Fusion::NormalizeL2Fusion() {
ngraph::copy_runtime_info(as_node_vector(outputs_to_replace), normalize_l2);
ngraph::replace_node(m.get_match_root(), normalize_l2);
MATCHER_SCOPE_ENABLE(NormalizeL2Fusion);
return true;
};
@@ -143,7 +143,7 @@ pass::PadFusionAvgPool::PadFusionAvgPool() {
copy_runtime_info({pad, avg_pool}, new_avg_pool);
replace_node(avg_pool, new_avg_pool);
MATCHER_SCOPE_ENABLE(PadFusionAvgPool);
return true;
};
@@ -218,7 +218,7 @@ pass::PadFusionConvolution::PadFusionConvolution() {
copy_runtime_info({pad, conv}, new_conv);
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(PadFusionConvolution);
return true;
};
@@ -276,7 +276,7 @@ pass::PadFusionConvolutionBackpropData::PadFusionConvolutionBackpropData() {
copy_runtime_info({pad, conv}, new_conv);
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(PadFusionConvolutionBackpropData);
return true;
};
@@ -324,7 +324,7 @@ pass::PadFusionGroupConvolution::PadFusionGroupConvolution() {
copy_runtime_info({pad, conv}, new_conv);
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(PadFusionGroupConvolution);
return true;
};
@@ -382,7 +382,7 @@ pass::PadFusionGroupConvolutionBackpropData::PadFusionGroupConvolutionBackpropDa
copy_runtime_info({pad, conv}, new_conv);
replace_node(conv, new_conv);
MATCHER_SCOPE_ENABLE(PadFusionGroupConvolutionBackpropData);
return true;
};
@@ -47,7 +47,6 @@ ngraph::pass::PReluFusionNegativeAdd::PReluFusionNegativeAdd() {
pattern_to_output.at(add).get_node_shared_ptr()};
ngraph::copy_runtime_info(copy_from, prelu);
ngraph::replace_node(add_node, prelu);
MATCHER_SCOPE_ENABLE(PReluFusionNegativeAdd);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(add, matcher_name);
@@ -78,7 +77,6 @@ ngraph::pass::PReluFusionNegativeSub::PReluFusionNegativeSub() {
pattern_to_output.at(sub).get_node_shared_ptr()};
ngraph::copy_runtime_info(copy_from, prelu);
ngraph::replace_node(sub_node, prelu);
MATCHER_SCOPE_ENABLE(PReluFusionNegativeSub);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(sub, matcher_name);
@@ -126,7 +124,6 @@ ngraph::pass::PReluFusionMultiplyAdd::PReluFusionMultiplyAdd() {
pattern_to_output.at(add).get_node_shared_ptr()};
ngraph::copy_runtime_info(copy_from, {prelu, negative});
ngraph::replace_node(add_node, prelu);
MATCHER_SCOPE_ENABLE(PReluFusionMultiplyAdd);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(add, matcher_name);
@@ -159,7 +156,6 @@ ngraph::pass::PReluFusionMultiplySub::PReluFusionMultiplySub() {
pattern_to_output.at(sub).get_node_shared_ptr()};
ngraph::copy_runtime_info(copy_from, prelu);
ngraph::replace_node(sub_node, prelu);
MATCHER_SCOPE_ENABLE(PReluFusionMultiplySub);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(sub, matcher_name);
@@ -74,7 +74,7 @@ ngraph::pass::PullTransposeThroughFQUp::PullTransposeThroughFQUp() {
new_fq->set_friendly_name(transpose->get_friendly_name());
ngraph::copy_runtime_info({fq, transpose}, new_ops);
ngraph::replace_node(transpose, new_fq);
MATCHER_SCOPE_ENABLE(PullTransposeThroughFQUp);
return true;
};
@@ -82,7 +82,7 @@ ngraph::pass::RandomUniformFusion::RandomUniformFusion() {
new_ru->set_friendly_name(m.get_match_root()->get_friendly_name());
ngraph::replace_node(m.get_match_root(), new_ru);
}
MATCHER_SCOPE_ENABLE(RandomUniformFusion);
return true;
};
@@ -93,7 +93,6 @@ pass::ReduceMerge::ReduceMerge() {
reduce_sum_pattern});
ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(ReduceMerge);
const auto node = m.get_match_root();
if (ov::is_type<op::util::ArithmeticReductionKeepDims>(node)) {
return fuse_reduce_operations<op::util::ArithmeticReductionKeepDims>(node);
@@ -51,7 +51,7 @@ ngraph::pass::ReluFakeQuantizeFusion::ReluFakeQuantizeFusion() {
copy_runtime_info({relu.get_node_shared_ptr(), fq}, new_fq);
replace_node(fq, new_fq);
MATCHER_SCOPE_ENABLE(ReluFakeQuantizeFusion);
return true;
};
@@ -18,7 +18,6 @@ ov::pass::RemoveConcatZeroDimInput::RemoveConcatZeroDimInput() {
MATCHER_SCOPE(RemoveConcatZeroDimInput);
auto concat_pattern = pattern::wrap_type<opset8::Concat>();
ngraph::matcher_pass_callback callback = [=](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(RemoveConcatZeroDimInput);
auto concat = m.get_match_root();
auto concat_inputs = concat->input_values();
concat_inputs.erase(
@@ -108,7 +108,7 @@ ngraph::pass::RemoveFilteringBoxesBySize::RemoveFilteringBoxesBySize() {
range->set_friendly_name(output->get_friendly_name());
// TODO: add copy_runtime_info
ngraph::replace_node(output, range);
MATCHER_SCOPE_ENABLE(RemoveFilteringBoxesBySize);
return true;
};
@@ -18,7 +18,6 @@ ov::pass::RemoveMultiSubGraphOpDanglingParams::RemoveMultiSubGraphOpDanglingPara
MATCHER_SCOPE(RemoveMultiSubGraphOpDanglingParams);
auto multi_subgraph_op_pattern = pattern::wrap_type<op::util::MultiSubGraphOp>();
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(RemoveMultiSubGraphOpDanglingParams);
auto multi_subgraph_op = std::dynamic_pointer_cast<op::util::MultiSubGraphOp>(m.get_match_root());
if (multi_subgraph_op == nullptr) {
return false;
@@ -108,7 +108,6 @@ ngraph::pass::ReshapeSequenceFusion::ReshapeSequenceFusion(bool use_shape_for_el
return false; // because root node wasn't replaced
}
MATCHER_SCOPE_ENABLE(ReshapeSequenceFusion);
return true;
};
@@ -221,7 +221,6 @@ public:
// Mark-up RIC output
ric_attr::init(concat, order, concat->get_axis());
MATCHER_SCOPE_ENABLE(SplitConcat);
return true;
};
@@ -278,7 +277,6 @@ public:
return false;
}
ric_attr::init(output, order_values, axis_value);
MATCHER_SCOPE_ENABLE(Gather);
return true;
};
@@ -385,7 +383,6 @@ public:
}
ric_attr::set(m.get_match_value(), ric);
MATCHER_SCOPE_ENABLE(Binary);
return true;
};
@@ -440,7 +437,6 @@ public:
} else {
ric_attr::set(conv->input(1), ric);
}
MATCHER_SCOPE_ENABLE(Convolution);
return true;
};
@@ -516,7 +512,6 @@ public:
ric.set_order(new_order);
ric_attr::set(conv->output(0), ric);
MATCHER_SCOPE_ENABLE(GroupConvolution);
return true;
};
@@ -533,7 +528,6 @@ public:
auto callback = [=](pattern::Matcher& m) {
// Skip propagation for ShapeOf path
MATCHER_SCOPE_ENABLE(ShapeOf);
return true;
};
@@ -554,7 +548,6 @@ public:
if (!ric_attr::has(root->input_value(0)))
return false;
ric_attr::set(root->output(0), ric_attr::get(root->input_value(0)).propagate());
MATCHER_SCOPE_ENABLE(PassThrough);
return true;
};
@@ -584,7 +577,6 @@ public:
ric.set_axis(new_axis);
ric_attr::set(m.get_match_value(), ric);
MATCHER_SCOPE_ENABLE(Transpose);
return true;
};
@@ -631,7 +623,6 @@ public:
MATCHER_SCOPE(InsertReverseInputChannel);
auto pattern_root = pattern::any_input();
auto callback = [](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(InsertReverseInputChannel);
const auto& node = m.get_match_root();
for (const auto& input : node->inputs()) {
if (!ric_attr::has(input))
@@ -662,7 +653,6 @@ public:
auto output = pattern_map.at(pattern_root);
auto input = pattern_map.at(input_p);
output.replace(input);
MATCHER_SCOPE_ENABLE(EraseSplitConcat);
return true;
};
@@ -679,7 +669,6 @@ public:
auto pattern_root = pattern::wrap_type<opset8::Gather>({input_p, pattern::any_input(), pattern::any_input()},
need_to_erase_ric);
auto callback = [=](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(EraseGather);
const auto& pattern_map = m.get_pattern_value_map();
auto output = pattern_map.at(pattern_root);
auto input = pattern_map.at(input_p);
@@ -151,7 +151,6 @@ ngraph::pass::ShuffleChannelsFusion::ShuffleChannelsFusion(const bool reshape_co
shuffle_shannels->set_friendly_name(reshape_after->get_friendly_name());
ngraph::copy_runtime_info({reshape_before, transpose, reshape_after}, shuffle_shannels);
ngraph::replace_node(reshape_after, shuffle_shannels);
MATCHER_SCOPE_ENABLE(ShuffleChannelsFusion);
return true;
};
@@ -63,7 +63,6 @@ ngraph::pass::GroupedGatherElimination::GroupedGatherElimination() {
auto concat_label = ngraph::pattern::wrap_type<ngraph::opset1::Concat>(pattern::rank_equals(1));
ngraph::matcher_pass_callback callback = [=](pattern::Matcher& m) {
MATCHER_SCOPE_ENABLE(GroupedGatherElimination);
auto concat = m.get_match_root();
OutputVector inputs = concat->input_values();
NodeVector new_ops;
@@ -82,7 +82,7 @@ ngraph::pass::SkipGatherBeforeTransposeAndReshape::SkipGatherBeforeTransposeAndR
new_transpose->set_friendly_name(transpose->get_friendly_name());
ngraph::copy_runtime_info({transpose, gather}, new_transpose);
ngraph::replace_node(transpose, new_transpose);
MATCHER_SCOPE_ENABLE(SkipGatherBeforeTransposeAndReshape);
return false;
};
@@ -66,7 +66,7 @@ ngraph::pass::SoftmaxFusion::SoftmaxFusion() {
},
softmax);
replace_node(div, softmax);
MATCHER_SCOPE_ENABLE(SoftmaxFusion);
return true;
};
@@ -44,7 +44,6 @@ ngraph::pass::SoftPlusFusion::SoftPlusFusion() {
pattern_to_output.at(exp).get_node_shared_ptr()},
softplus);
ngraph::replace_node(m.get_match_root(), softplus);
MATCHER_SCOPE_ENABLE(SoftPlusFusion);
return true;
};
@@ -31,7 +31,6 @@ ngraph::pass::SoftPlusToMishFusion::SoftPlusToMishFusion() {
pattern_to_output.at(softplus).get_node_shared_ptr()},
mish);
ngraph::replace_node(m.get_match_root(), mish);
MATCHER_SCOPE_ENABLE(SoftPlusToMishFusion);
return true;
};
@@ -108,7 +108,7 @@ ngraph::pass::SpaceToBatchFusion::SpaceToBatchFusion() {
},
space_to_batch);
replace_node(reshape_or_trans_after, space_to_batch);
MATCHER_SCOPE_ENABLE(SpaceToBatchFusion);
return true;
};
@@ -223,7 +223,7 @@ ngraph::pass::SplitConcatPairToInterpolateFusion::SplitConcatPairToInterpolateFu
sizes_node,
interpolate});
replace_node(concat, interpolate);
MATCHER_SCOPE_ENABLE(SplitConcatPairToInterpolateFusion);
return true;
};
@@ -97,7 +97,6 @@ ngraph::pass::SplitSqueezeConcatFusion::SplitSqueezeConcatFusion() {
reshape->set_friendly_name(m.get_match_root()->get_friendly_name());
ngraph::copy_runtime_info(nodes_to_delete, {transpose, reshape});
ngraph::replace_node(m.get_match_root(), reshape);
MATCHER_SCOPE_ENABLE(SplitSqueezeConcatFusion);
return true;
};
@@ -147,7 +147,7 @@ ngraph::pass::ConvStridesPropagation::ConvStridesPropagation() {
conv->set_auto_pad(op::PadType::EXPLICIT);
conv->set_strides(conv_strides);
}
MATCHER_SCOPE_ENABLE(ConvStridesPropagation);
return true;
};
@@ -173,7 +173,7 @@ ngraph::pass::SupportedNodesStridesPropagation::SupportedNodesStridesPropagation
for (auto& input : node->inputs()) {
insert_strides_prop(input, strides);
}
MATCHER_SCOPE_ENABLE(SupportedNodesStridesPropagation);
return true;
};
@@ -189,7 +189,7 @@ ngraph::pass::UnsupportedNodesStridesPropagation::UnsupportedNodesStridesPropaga
auto node = m.get_match_root();
auto next_ops = op::util::get_node_target_inputs(node);
handle_not_equal_stride_props(std::move(next_ops));
MATCHER_SCOPE_ENABLE(UnsupportedNodesStridesPropagation);
return true;
};
@@ -51,7 +51,6 @@ ngraph::pass::SubtractFusion::SubtractFusion() {
sub->set_friendly_name(add->get_friendly_name());
copy_runtime_info(nodes_to_replace, sub);
replace_node(add, sub);
MATCHER_SCOPE_ENABLE(SubtractFusion);
return true;
};
@@ -50,7 +50,6 @@ ngraph::pass::SwishFusionWithSigmoid::SwishFusionWithSigmoid() {
{pattern_to_output.at(sigmoid).get_node_shared_ptr(), pattern_to_output.at(mul).get_node_shared_ptr()},
swish);
ngraph::replace_node(m.get_match_root(), swish);
MATCHER_SCOPE_ENABLE(SwishFusionWithSigmoid);
return true;
};
@@ -97,7 +96,6 @@ ngraph::pass::SwishFusionWithSigmoidWithBeta::SwishFusionWithSigmoidWithBeta() {
{pattern_to_output.at(sigmoid).get_node_shared_ptr(), pattern_to_output.at(mul).get_node_shared_ptr()},
swish);
ngraph::replace_node(m.get_match_root(), swish);
MATCHER_SCOPE_ENABLE(SwishFusionWithSigmoidWithBeta);
return true;
};
@@ -139,7 +137,6 @@ ngraph::pass::SwishFusionWithBeta::SwishFusionWithBeta() {
pattern_to_output.at(div).get_node_shared_ptr()},
swish);
ngraph::replace_node(m.get_match_root(), swish);
MATCHER_SCOPE_ENABLE(SwishFusionWithBeta);
return true;
};
@@ -177,7 +174,6 @@ ngraph::pass::SwishFusionWithoutBeta::SwishFusionWithoutBeta() {
pattern_to_output.at(div).get_node_shared_ptr()},
swish);
ngraph::replace_node(m.get_match_root(), swish);
MATCHER_SCOPE_ENABLE(SwishFusionWithoutBeta);
return true;
};
@@ -185,7 +185,6 @@ ngraph::pass::TransposeReshapeEliminationForMatmul::TransposeReshapeEliminationF
new_matmul->set_friendly_name(transpose_after->get_friendly_name());
copy_runtime_info({transpose_before, reshape_before, matmul, reshape_after, transpose_after}, new_matmul);
replace_node(transpose_after, new_matmul);
MATCHER_SCOPE_ENABLE(TransposeReshapeEliminationForMatmul);
return true;
};
@@ -98,7 +98,6 @@ ngraph::pass::TransposeEltwise::TransposeEltwise() {
new_transpose->set_friendly_name(eltwise->get_friendly_name());
copy_runtime_info({eltwise, transpose}, {new_transpose, new_eltwise});
replace_node(transpose, new_eltwise);
MATCHER_SCOPE_ENABLE(TransposeEltwise);
return true;
};
@@ -126,7 +125,6 @@ ngraph::pass::TransposeConvert::TransposeConvert() {
new_transpose->set_friendly_name(convert->get_friendly_name());
copy_runtime_info({transpose, convert}, {new_convert, new_transpose});
replace_node(convert, new_transpose);
MATCHER_SCOPE_ENABLE(TransposeConvert);
return true;
};
@@ -194,7 +192,7 @@ ngraph::pass::TransposeReduction::TransposeReduction() {
ngraph::copy_runtime_info({reduction, transpose}, new_ops);
ngraph::replace_node(reduction, new_transpose);
MATCHER_SCOPE_ENABLE(TransposeReduction);
return true;
};
@@ -263,7 +261,6 @@ ngraph::pass::TransposeFQReduction::TransposeFQReduction() {
ngraph::replace_node(fq, new_transpose);
// The root node (reduction) left unchanged during current matcher pass.
// We return false here for further MatcherPasses to be applicable for this node as a root node
MATCHER_SCOPE_ENABLE(TransposeFQReduction);
return false;
};
@@ -315,7 +312,7 @@ ngraph::pass::TransposeFuse::TransposeFuse() {
ngraph::copy_runtime_info({transpose1, transpose2}, new_transpose);
ngraph::replace_node(m.get_match_root(), new_transpose);
}
MATCHER_SCOPE_ENABLE(TransposeFuse);
return true;
};
@@ -102,7 +102,6 @@ ngraph::pass::TransposeToReshape::TransposeToReshape() {
reshape_op->set_friendly_name(transpose->get_friendly_name());
copy_runtime_info(transpose, new_ops);
replace_node(transpose, reshape_op);
MATCHER_SCOPE_ENABLE(TransposeToReshape);
return true;
};
@@ -73,7 +73,6 @@ ngraph::pass::WeightsDequantizeToFakeQuantize::WeightsDequantizeToFakeQuantize()
if (ov::constant_folding_is_disabled(convert_node))
ov::enable_constant_folding(convert_node);
MATCHER_SCOPE_ENABLE(WeightsDequantizeToFakeQuantize);
return true;
};
@@ -100,7 +100,7 @@ ngraph::pass::WrapInterpolateIntoTransposes::WrapInterpolateIntoTransposes() {
last_transpose_perm,
last_transpose});
replace_node(interpolate, last_transpose);
MATCHER_SCOPE_ENABLE(WrapInterpolateIntoTransposes);
return true;
};
@@ -19,7 +19,6 @@ ov::pass::DisableDecompressionConvertConstantFolding::DisableDecompressionConver
if (!ov::is_decompression(node))
return false;
disable_constant_folding(node);
MATCHER_SCOPE_ENABLE(DisableDecompressionConvertConstantFolding);
return true;
};
@@ -98,7 +98,7 @@ ngraph::pass::BatchNormDecomposition::BatchNormDecomposition() {
{scale_add, scale, gamma_div_scale, gamma_div_scale_aligned, beta_aligned, input_sub_mean, mul, add});
replace_node(m_bn, add);
MATCHER_SCOPE_ENABLE(BatchNormDecomposition);
return true;
};
auto m = std::make_shared<ngraph::pattern::Matcher>(bn, matcher_name);
@@ -78,7 +78,6 @@ ngraph::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceD
concat_1->set_friendly_name(lstm_sequence->get_friendly_name() + ".1");
concat_2->set_friendly_name(lstm_sequence->get_friendly_name() + ".2");
ngraph::replace_node(lstm_sequence, {concat_0->output(0), concat_1->output(0), concat_2->output(0)});
MATCHER_SCOPE_ENABLE(BidirectionalLSTMSequenceDecomposition);
return true;
};
@@ -146,7 +145,6 @@ ngraph::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDec
concat_0->set_friendly_name(gru_sequence->get_friendly_name() + ".0");
concat_1->set_friendly_name(gru_sequence->get_friendly_name() + ".1");
ngraph::replace_node(gru_sequence, {concat_0->output(0), concat_1->output(0)});
MATCHER_SCOPE_ENABLE(BidirectionalGRUSequenceDecomposition);
return true;
};
@@ -212,7 +210,6 @@ ngraph::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDec
concat_0->set_friendly_name(rnn_sequence->get_friendly_name() + ".0");
concat_1->set_friendly_name(rnn_sequence->get_friendly_name() + ".1");
ngraph::replace_node(rnn_sequence, {concat_0->output(0), concat_1->output(0)});
MATCHER_SCOPE_ENABLE(BidirectionalRNNSequenceDecomposition);
return true;
};
@@ -118,7 +118,6 @@ void ngraph::pass::ConvertBatchToSpace::convert_batch_to_space() {
flat_node->set_friendly_name(batch_to_space->get_friendly_name());
ngraph::copy_runtime_info(batch_to_space, new_ops);
ngraph::replace_node(batch_to_space, flat_node);
MATCHER_SCOPE_ENABLE(ConvertBatchToSpace_convert_batch_to_space);
return true;
};
@@ -220,7 +219,6 @@ void ngraph::pass::ConvertBatchToSpace::convert_batch_to_space_by_elements() {
flat_node->set_friendly_name(batch_to_space->get_friendly_name());
ngraph::copy_runtime_info(batch_to_space, new_ops);
ngraph::replace_node(batch_to_space, flat_node);
MATCHER_SCOPE_ENABLE(ConvertBatchToSpace_convert_batch_to_space_by_elements);
return true;
};
@@ -115,7 +115,6 @@ ngraph::pass::ConvertBroadcast3::ConvertBroadcast3() {
input.get_node_shared_ptr()->set_friendly_name(broadcast->get_friendly_name());
copy_runtime_info(broadcast, input.get_node_shared_ptr());
replace_node(broadcast, {input});
MATCHER_SCOPE_ENABLE(ConvertBroadcast3);
return true;
};
@@ -96,7 +96,6 @@ ngraph::pass::ConvertBroadcastToTiles::ConvertBroadcastToTiles() {
ngraph::copy_runtime_info(broadcast, new_ops);
ngraph::replace_node(broadcast, tile);
MATCHER_SCOPE_ENABLE(ConvertBroadcastToTiles);
return true;
};
@@ -43,7 +43,6 @@ ngraph::pass::ConvertDeformableConv8To1::ConvertDeformableConv8To1() {
deformable_conv_v1->set_friendly_name(deformable_conv_v8_node->get_friendly_name());
ngraph::copy_runtime_info(deformable_conv_v8_node, deformable_conv_v1);
ngraph::replace_node(deformable_conv_v8_node, deformable_conv_v1);
MATCHER_SCOPE_ENABLE(ConvertDeformableConv8To1);
return true;
};
@@ -98,7 +98,6 @@ ngraph::pass::ConvertDepthToSpace::ConvertDepthToSpace() {
reshape_end->set_friendly_name(dts_node->get_friendly_name());
ngraph::copy_runtime_info(dts_node, {reshape_begin, transpose, reshape_end});
ngraph::replace_node(dts_node, reshape_end);
MATCHER_SCOPE_ENABLE(ConvertDepthToSpace);
return true;
};
@@ -55,7 +55,6 @@ bool convert_divide(std::shared_ptr<ngraph::Node> node) {
ngraph::pass::ConvertDivide::ConvertDivide() {
MATCHER_SCOPE(ConvertDivide);
MATCHER_SCOPE_ENABLE(ConvertDivide);
auto div = ngraph::pattern::wrap_type<ngraph::opset1::Divide>();
ngraph::matcher_pass_callback callback = [](pattern::Matcher& m) {
@@ -68,7 +67,6 @@ ngraph::pass::ConvertDivide::ConvertDivide() {
ngraph::pass::ConvertDivideWithConstant::ConvertDivideWithConstant() {
MATCHER_SCOPE(ConvertDivideWithConstant);
MATCHER_SCOPE_ENABLE(ConvertDivideWithConstant);
auto div =
ngraph::pattern::wrap_type<ngraph::opset1::Divide>({pattern::any_input(), pattern::wrap_type<op::Constant>()});
@@ -46,7 +46,7 @@ ngraph::pass::ConvertGather0D::ConvertGather0D() {
ngraph::copy_runtime_info(gather, {indices.get_node_shared_ptr(), gather_new, sq});
ngraph::replace_node(gather, sq);
MATCHER_SCOPE_ENABLE(ConvertGather0D);
return true;
};
@@ -34,7 +34,6 @@ pass::ConvertGather7ToGather1::ConvertGather7ToGather1() {
gather_v1_node->set_friendly_name(gather_v7_node->get_friendly_name());
ngraph::copy_runtime_info(gather_v7_node, gather_v1_node);
ngraph::replace_node(gather_v7_node, gather_v1_node);
MATCHER_SCOPE_ENABLE(ConvertGather7ToGather1);
return true;
};
@@ -60,7 +59,6 @@ pass::ConvertGather8ToGather7::ConvertGather8ToGather7() {
gather_v7_node->set_friendly_name(gather_v8_node->get_friendly_name());
ngraph::copy_runtime_info(gather_v8_node, gather_v7_node);
ngraph::replace_node(gather_v8_node, gather_v7_node);
MATCHER_SCOPE_ENABLE(ConvertGather8ToGather7);
return true;
};
@@ -33,7 +33,6 @@ pass::ConvertGather1ToGather7::ConvertGather1ToGather7() {
gather_v7_node->set_friendly_name(gather_v1_node->get_friendly_name());
ngraph::copy_runtime_info(gather_v1_node, gather_v7_node);
ngraph::replace_node(gather_v1_node, gather_v7_node);
MATCHER_SCOPE_ENABLE(ConvertGather1ToGather7);
return true;
};
@@ -59,7 +58,6 @@ pass::ConvertGather7ToGather8::ConvertGather7ToGather8() {
gather_v8_node->set_friendly_name(gather_v7_node->get_friendly_name());
ngraph::copy_runtime_info(gather_v7_node, gather_v8_node);
ngraph::replace_node(gather_v7_node, gather_v8_node);
MATCHER_SCOPE_ENABLE(ConvertGather7ToGather8);
return true;
};
@@ -36,7 +36,6 @@ ngraph::pass::ConvertGELU::ConvertGELU() {
res->set_friendly_name(gelu->get_friendly_name());
ngraph::copy_runtime_info(gelu, {mul, sq2, div, erf, add, res});
ngraph::replace_node(gelu, res);
MATCHER_SCOPE_ENABLE(ConvertGELU);
return true;
};
@@ -100,7 +100,6 @@ ngraph::pass::ConvertInterpolate1ToInterpolate4::ConvertInterpolate1ToInterpolat
interpolateV4->set_friendly_name(interpolationV0->get_friendly_name());
ngraph::copy_runtime_info(interpolationV0, interpolateV4);
ngraph::replace_node(interpolationV0, interpolateV4);
MATCHER_SCOPE_ENABLE(ConvertInterpolate1ToInterpolate4);
return true;
};
@@ -59,7 +59,6 @@ ngraph::pass::ConvertMatrixNmsToMatrixNmsIE::ConvertMatrixNmsToMatrixNmsIE(bool
nms_new->set_friendly_name(nms->get_friendly_name());
ngraph::copy_runtime_info(nms, new_ops);
ngraph::replace_node(nms, {output_0, output_1, output_2});
MATCHER_SCOPE_ENABLE(ConvertMatrixNmsToMatrixNmsIE);
return true;
};
@@ -48,7 +48,7 @@ pass::ConvertMaxPool8ToMaxPool1::ConvertMaxPool8ToMaxPool1() {
NGRAPH_SUPPRESS_DEPRECATED_START
maxpool_v1_node->output(0).get_tensor().set_name(out_name);
NGRAPH_SUPPRESS_DEPRECATED_END
MATCHER_SCOPE_ENABLE(ConvertMaxPool8ToMaxPool1);
return true;
};
@@ -45,7 +45,7 @@ ngraph::pass::ConvertMaxPool1ToMaxPool8::ConvertMaxPool1ToMaxPool8() {
maxpool_v1_node->output(0).replace(maxpool_v8_node->output(0));
ngraph::copy_runtime_info(maxpool_v1_node, maxpool_v8_node);
maxpool_v1_node->clear_control_dependencies();
MATCHER_SCOPE_ENABLE(ConvertMaxPool1ToMaxPool8);
return true;
};
@@ -44,7 +44,6 @@ ngraph::pass::ConvertMinimum::ConvertMinimum() {
neg_2->set_friendly_name(minimum->get_friendly_name());
ngraph::copy_runtime_info(minimum, {neg_0, neg_1, max, neg_2});
ngraph::replace_node(minimum, neg_2);
MATCHER_SCOPE_ENABLE(ConvertMinimum);
return true;
};
@@ -44,7 +44,6 @@ ngraph::pass::ConvertMod::ConvertMod() {
mod,
{dividend, dividend_sign, divisor, div, convert_to_i64, convert, multiplication, sub, mul});
ngraph::replace_node(mod, mul);
MATCHER_SCOPE_ENABLE(ConvertMod);
return true;
};
@@ -73,7 +73,6 @@ pass::ConvertMulticlassNmsToMulticlassNmsIE::ConvertMulticlassNmsToMulticlassNms
nms_new->set_friendly_name(nms->get_friendly_name());
copy_runtime_info(nms, new_ops);
replace_node(nms, {output_0, output_1, output_2});
MATCHER_SCOPE_ENABLE(ConvertMulticlassNmsToMulticlassNmsIE);
return true;
};
@@ -29,7 +29,7 @@ ngraph::pass::ConvertMulticlassNms8ToMulticlassNms9::ConvertMulticlassNms8ToMult
nms_v9_node->set_friendly_name(nms_v8_node->get_friendly_name());
copy_runtime_info(nms_v8_node, nms_v9_node);
replace_node(nms_v8_node, nms_v9_node);
MATCHER_SCOPE_ENABLE(ConvertMulticlassNms8ToMulticlassNms9);
return true;
};
@@ -43,7 +43,6 @@ ngraph::pass::ConvertMVN1ToMVN6::ConvertMVN1ToMVN6() {
mvn6_node->set_friendly_name(mvn_node->get_friendly_name());
ngraph::copy_runtime_info(mvn_node, mvn6_node);
ngraph::replace_node(mvn_node, mvn6_node);
MATCHER_SCOPE_ENABLE(ConvertMVN1ToMVN6);
return true;
};
@@ -28,7 +28,6 @@ ngraph::pass::ConvertNegative::ConvertNegative() {
mul->set_friendly_name(neg->get_friendly_name());
ngraph::copy_runtime_info(neg, mul);
ngraph::replace_node(neg, mul);
MATCHER_SCOPE_ENABLE(ConvertNegative);
return true;
};
@@ -120,7 +120,6 @@ ngraph::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() {
nms_legacy->set_friendly_name(nms_9->get_friendly_name());
ngraph::copy_runtime_info(nms_9, new_ops);
ngraph::replace_node(nms_9, {output_0, nms_legacy->output(1), output_2});
MATCHER_SCOPE_ENABLE(ConvertNMS9ToNMSIEInternal);
return true;
};
@@ -120,7 +120,6 @@ ngraph::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() {
nms_legacy->set_friendly_name(nms_5->get_friendly_name());
ngraph::copy_runtime_info(nms_5, new_ops);
ngraph::replace_node(nms_5, {output_0, nms_legacy->output(1), output_2});
MATCHER_SCOPE_ENABLE(ConvertNMSToNMSIEInternal);
return true;
};
@@ -85,7 +85,6 @@ ngraph::pass::ConvertPadToGroupConvolution::ConvertPadToGroupConvolution() {
conv->set_friendly_name(pad->get_friendly_name());
ngraph::copy_runtime_info(pad, conv);
ngraph::replace_node(pad, conv);
MATCHER_SCOPE_ENABLE(ConvertPadToGroupConvolution);
return true;
};
@@ -159,7 +159,6 @@ bool callback_func(pattern::Matcher& m, pass::MatcherPass* impl) {
ngraph::pass::ConvertNMS4ToNMS5::ConvertNMS4ToNMS5() {
MATCHER_SCOPE(ConvertNMS4ToNMS5);
MATCHER_SCOPE_ENABLE(ConvertNMS4ToNMS5);
auto nms = ngraph::pattern::wrap_type<ngraph::opset4::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return callback_func(m, this);
@@ -171,7 +170,6 @@ ngraph::pass::ConvertNMS4ToNMS5::ConvertNMS4ToNMS5() {
ngraph::pass::ConvertNMS3ToNMS5::ConvertNMS3ToNMS5() {
MATCHER_SCOPE(ConvertNMS3ToNMS5);
MATCHER_SCOPE_ENABLE(ConvertNMS3ToNMS5);
auto nms = ngraph::pattern::wrap_type<ngraph::opset3::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return callback_func(m, this);
@@ -183,7 +181,6 @@ ngraph::pass::ConvertNMS3ToNMS5::ConvertNMS3ToNMS5() {
ngraph::pass::ConvertNMS1ToNMS5::ConvertNMS1ToNMS5() {
MATCHER_SCOPE(ConvertNMS1ToNMS5);
MATCHER_SCOPE_ENABLE(ConvertNMS1ToNMS5);
auto nms = ngraph::pattern::wrap_type<ngraph::opset1::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return callback_func(m, this);
@@ -197,7 +197,6 @@ bool nms_to_nms9_callback_func(pattern::Matcher& m, pass::MatcherPass* impl) {
ngraph::pass::ConvertNMS5ToNMS9::ConvertNMS5ToNMS9() {
MATCHER_SCOPE(ConvertNMS5ToNMS9);
MATCHER_SCOPE_ENABLE(ConvertNMS5ToNMS9);
auto nms = ngraph::pattern::wrap_type<ngraph::opset5::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return nms_to_nms9_callback_func(m, this);
@@ -209,7 +208,6 @@ ngraph::pass::ConvertNMS5ToNMS9::ConvertNMS5ToNMS9() {
ngraph::pass::ConvertNMS4ToNMS9::ConvertNMS4ToNMS9() {
MATCHER_SCOPE(ConvertNMS4ToNMS9);
MATCHER_SCOPE_ENABLE(ConvertNMS4ToNMS9);
auto nms = ngraph::pattern::wrap_type<ngraph::opset4::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return nms_to_nms9_callback_func(m, this);
@@ -221,7 +219,6 @@ ngraph::pass::ConvertNMS4ToNMS9::ConvertNMS4ToNMS9() {
ngraph::pass::ConvertNMS3ToNMS9::ConvertNMS3ToNMS9() {
MATCHER_SCOPE(ConvertNMS3ToNMS9);
MATCHER_SCOPE_ENABLE(ConvertNMS3ToNMS9);
auto nms = ngraph::pattern::wrap_type<ngraph::opset3::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return nms_to_nms9_callback_func(m, this);
@@ -233,7 +230,6 @@ ngraph::pass::ConvertNMS3ToNMS9::ConvertNMS3ToNMS9() {
ngraph::pass::ConvertNMS1ToNMS9::ConvertNMS1ToNMS9() {
MATCHER_SCOPE(ConvertNMS1ToNMS9);
MATCHER_SCOPE_ENABLE(ConvertNMS1ToNMS9);
auto nms = ngraph::pattern::wrap_type<ngraph::opset1::NonMaxSuppression>();
ngraph::matcher_pass_callback callback = [this](pattern::Matcher& m) {
return nms_to_nms9_callback_func(m, this);
@@ -45,7 +45,7 @@ ngraph::pass::ConvertPriorBox8To0::ConvertPriorBox8To0() {
prior_box_v0->set_friendly_name(prior_box_v8_node->get_friendly_name());
ngraph::copy_runtime_info(prior_box_v8_node, prior_box_v0);
ngraph::replace_node(prior_box_v8_node, prior_box_v0);
MATCHER_SCOPE_ENABLE(ConvertPriorBox8To0);
return true;
};
@@ -8,7 +8,6 @@
ngraph::pass::ConvertReduceMeanToPooling::ConvertReduceMeanToPooling() {
MATCHER_SCOPE(ConvertReduceMeanToPooling);
MATCHER_SCOPE_ENABLE(ConvertReduceMeanToPooling);
auto m = std::make_shared<ngraph::pattern::Matcher>(
ngraph::pattern::wrap_type<opset1::ReduceMean>(
{pattern::any_input(pattern::has_static_shape()), pattern::wrap_type<opset1::Constant>()},
@@ -18,7 +17,6 @@ ngraph::pass::ConvertReduceMeanToPooling::ConvertReduceMeanToPooling() {
}
ngraph::pass::ConvertReduceMaxToPooling::ConvertReduceMaxToPooling() {
MATCHER_SCOPE(ConvertReduceMaxToPooling);
MATCHER_SCOPE_ENABLE(ConvertReduceMaxToPooling);
auto m = std::make_shared<ngraph::pattern::Matcher>(
ngraph::pattern::wrap_type<opset1::ReduceMax>(
{pattern::any_input(pattern::has_static_shape()), pattern::wrap_type<opset1::Constant>()},
@@ -28,7 +26,6 @@ ngraph::pass::ConvertReduceMaxToPooling::ConvertReduceMaxToPooling() {
}
ngraph::pass::ConvertReduceSumToPooling::ConvertReduceSumToPooling() {
MATCHER_SCOPE(ConvertReduceSumToPooling);
MATCHER_SCOPE_ENABLE(ConvertReduceSumToPooling);
auto m = std::make_shared<ngraph::pattern::Matcher>(
ngraph::pattern::wrap_type<opset1::ReduceSum>(
{pattern::any_input(pattern::has_static_shape()), pattern::wrap_type<opset1::Constant>()},
@@ -52,7 +52,7 @@ ngraph::pass::ConvertROIAlign3To9::ConvertROIAlign3To9() {
roi_align_v9->set_friendly_name(roi_align_v3_node->get_friendly_name());
ngraph::copy_runtime_info(roi_align_v3_node, roi_align_v9);
ngraph::replace_node(roi_align_v3_node, roi_align_v9);
MATCHER_SCOPE_ENABLE(ConvertROIAlign3To9);
return true;
};
@@ -56,7 +56,7 @@ ngraph::pass::ConvertROIAlign9To3::ConvertROIAlign9To3() {
roi_align_v3->set_friendly_name(roi_align_v9_node->get_friendly_name());
ngraph::copy_runtime_info(roi_align_v9_node, roi_align_v3);
ngraph::replace_node(roi_align_v9_node, roi_align_v3);
MATCHER_SCOPE_ENABLE(ConvertROIAlign9To3);
return true;
};
@@ -101,7 +101,7 @@ ngraph::pass::ConvertScatterElementsToScatter::ConvertScatterElementsToScatter()
return false;
}
}
MATCHER_SCOPE_ENABLE(ConvertScatterElementsToScatter);
return true;
};
@@ -330,7 +330,6 @@ ngraph::pass::ConvertRNNSequenceToTensorIterator::ConvertRNNSequenceToTensorIter
const auto& R = pattern_map.at(R_m); // const in the body
const auto& B = pattern_map.at(B_m); // const in the body
MATCHER_SCOPE_ENABLE(ConvertRNNSequenceToTensorIterator);
return convert_sequence_to_ti(sequence,
X,
H_t,
@@ -374,7 +373,6 @@ ngraph::pass::ConvertGRUSequenceToTensorIterator::ConvertGRUSequenceToTensorIter
const auto& R = pattern_map.at(R_m); // const in the body
const auto& B = pattern_map.at(B_m); // const in the body
MATCHER_SCOPE_ENABLE(ConvertGRUSequenceToTensorIterator);
return convert_sequence_to_ti(sequence,
X,
H_t,
@@ -420,7 +418,6 @@ ngraph::pass::ConvertLSTMSequenceToTensorIterator::ConvertLSTMSequenceToTensorIt
const auto& R = pattern_map.at(R_m); // const in the body
const auto& B = pattern_map.at(B_m); // const in the body
MATCHER_SCOPE_ENABLE(ConvertLSTMSequenceToTensorIterator);
return convert_sequence_to_ti(sequence, X, H_t, C_t, seq_lengths, W, R, B, sequence->get_direction());
};
@@ -39,7 +39,6 @@ ngraph::pass::ConvertShapeOf3::ConvertShapeOf3() {
last.get_node_shared_ptr()->set_friendly_name(shapeof->get_friendly_name());
ngraph::copy_runtime_info(shapeof, new_ops);
ngraph::replace_node(shapeof, last.get_node_shared_ptr());
MATCHER_SCOPE_ENABLE(ConvertShapeOf3);
return true;
};
@@ -93,7 +93,6 @@ ngraph::pass::ConvertShuffleChannels3::ConvertShuffleChannels3() {
reshape_back->set_friendly_name(shuffle_channels->get_friendly_name());
::copy_runtime_info(shuffle_channels, new_ops);
::replace_node(shuffle_channels, reshape_back);
MATCHER_SCOPE_ENABLE(ConvertShuffleChannels3);
return true;
};
@@ -146,7 +146,6 @@ ngraph::pass::SliceToStridedSlice::SliceToStridedSlice(bool use_shapes) {
strided_slice->set_friendly_name(slice_node->get_friendly_name());
ngraph::copy_runtime_info(slice_node, new_ops);
ngraph::replace_node(slice_node, strided_slice);
MATCHER_SCOPE_ENABLE(SliceToStridedSlice);
return true;
};
@@ -31,7 +31,7 @@ ngraph::pass::ConvertSoftMax8ToSoftMax1::ConvertSoftMax8ToSoftMax1() {
softmax_v1_node->set_friendly_name(softmax_v8_node->get_friendly_name());
copy_runtime_info(softmax_v8_node, softmax_v1_node);
replace_node(softmax_v8_node, softmax_v1_node);
MATCHER_SCOPE_ENABLE(ConvertSoftMax8ToSoftMax1);
return true;
};
Loaded 100 of 198 files, more files were not shown because too many files have changed in this diff. Show more