From 23c50323eb043e7fcc4cbecc8d5aa8c35d4343f7 Mon Sep 17 00:00:00 2001 From: Smirnov Grigorii Date: Thu, 4 Nov 2021 12:28:19 +0300 Subject: [PATCH] Update existing functional tests to use pass::Manager (#8173) --- .../transformations/const_folding_for_if.cpp | 5 ++- .../const_folding_prior_box.cpp | 25 ++++++++----- .../transformations/conv_fusion_test.cpp | 6 +++- .../convert_convolution_test.cpp | 11 ++++-- .../convert_deconvolution_test.cpp | 10 ++++-- .../convert_ngraph_to_cnn_network_tests.cpp | 14 ++++++-- .../convert_reduce_to_pooling_test.cpp | 6 +++- ...nvert_scatter_elements_to_scatter_test.cpp | 10 ++++-- .../keep_constant_inputs_tests.cpp | 12 ++++--- .../mul_add_conversion_test.cpp | 19 ++++++---- .../ngraph_1d_ops_reshape_test.cpp | 26 +++++++++----- .../transformations/nop_elimination.cpp | 35 ++++++++++++++----- .../transformations/type_relaxed_tests.cpp | 21 ++++++----- 13 files changed, 142 insertions(+), 58 deletions(-) diff --git a/inference-engine/tests/functional/inference_engine/transformations/const_folding_for_if.cpp b/inference-engine/tests/functional/inference_engine/transformations/const_folding_for_if.cpp index 84dea503137..1cd9aebd685 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/const_folding_for_if.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/const_folding_for_if.cpp @@ -14,6 +14,7 @@ #include "ngraph/opsets/opset8.hpp" #include +#include using namespace testing; using namespace std; using namespace ngraph; @@ -49,7 +50,9 @@ TEST(TransformationTests, DISABLED_if_constant_folding) { auto add = make_shared(if_res, param_add); auto add_res = make_shared(add); fun = make_shared(OutputVector{ add_res }, ParameterVector{ param_add }); - ngraph::pass::ConstantFolding().run_on_function(fun); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(fun); } std::shared_ptr f_ref(nullptr); { diff --git a/inference-engine/tests/functional/inference_engine/transformations/const_folding_prior_box.cpp b/inference-engine/tests/functional/inference_engine/transformations/const_folding_prior_box.cpp index cb77d6b6bbc..a56ea2b612e 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/const_folding_prior_box.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/const_folding_prior_box.cpp @@ -15,6 +15,7 @@ #include #include #include "common_test_utils/ngraph_test_utils.hpp" +#include using namespace testing; @@ -35,8 +36,10 @@ TEST(TransformationTests, ConstFoldingPriorBox) { auto pb = std::make_shared(layer_shape, image_shape, attrs); auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -76,8 +79,10 @@ TEST(TransformationTests, ConstFoldingPriorBoxClustered) { auto pb = std::make_shared(layer_shape, image_shape, attrs); auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -135,8 +140,10 @@ TEST(TransformationTests, ConstFoldingPriorBoxSubgraph) { auto pb = std::make_shared(ss_data, ss_image, attrs); auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in, in_2}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -185,8 +192,10 @@ TEST(TransformationTests, ConstFoldingPriorBoxClusteredSubgraph) { auto pb = std::make_shared(ss_data, ss_image, attrs); auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in, in_2}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp index 389388f2958..ed6784c16b8 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp @@ -23,6 +23,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace ngraph; using namespace testing; @@ -50,7 +52,9 @@ public: f_ref = get_initial_function(input_shape, weights_shape, eltwise_type, eltwise_shape); } else { f_ref = get_reference_function(input_shape, weights_shape, eltwise_type, eltwise_shape); - ngraph::pass::ConstantFolding().run_on_function(f_ref); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(f_ref); } } diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp index 1a8e196be59..27f173304d1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp @@ -24,6 +24,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace testing; using namespace ngraph; using namespace ngraph::opset1; @@ -71,9 +73,12 @@ private: }; TEST_P(ConvertConvolutionTest, CompareFunctions) { - const auto & orig_shape = f->get_output_partial_shape(0); - pass::InitNodeInfo().run_on_function(f); - pass::ConvertConvolutions().run_on_function(f); + const auto orig_shape = f->get_output_partial_shape(0); + pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); + ASSERT_NO_THROW(check_rt_info(f)); auto res = compare_functions(f, f_ref); ASSERT_TRUE(res.first) << res.second; diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp index 3c456c7f083..242325390d2 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp @@ -24,6 +24,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace testing; using InputShape = ngraph::PartialShape; @@ -67,9 +69,11 @@ private: }; TEST_P(ConvertDeconvolutionTest, CompareFunctions) { - const auto & orig_shape = f->get_output_partial_shape(0); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::ConvertConvolutions().run_on_function(f); + const auto orig_shape = f->get_output_partial_shape(0); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); auto res = compare_functions(f, f_ref); ASSERT_TRUE(res.first) << res.second; diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_ngraph_to_cnn_network_tests.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_ngraph_to_cnn_network_tests.cpp index 44caeeb1a4b..c62de865091 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_ngraph_to_cnn_network_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_ngraph_to_cnn_network_tests.cpp @@ -23,6 +23,8 @@ #include #include +#include + using namespace testing; using namespace InferenceEngine; @@ -37,7 +39,9 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertPReLUNetwork) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); - ngraph::pass::InitNodeInfo().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(f); } InferenceEngine::CNNNetwork nGraphImpl(f); @@ -66,7 +70,9 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertConvolutionNetwork) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); - ngraph::pass::InitNodeInfo().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(f); } InferenceEngine::CNNNetwork nGraphImpl(f); @@ -162,7 +168,9 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertTopKWithOneInput) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param}); - ngraph::pass::InitNodeInfo().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(f); } ngraph::pass::Manager manager; diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp index fec70c317ba..866f8a8bcc3 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp @@ -21,6 +21,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace testing; using InputShape = ngraph::PartialShape; @@ -149,7 +151,9 @@ INSTANTIATE_TEST_SUITE_P(ReduceToReshapePoolReshape, ConvertReduceToPoolingTests TEST(ConvertReduceToPooling, Negative) { auto f = ConvertReduceToPoolingTests::get_initial_function(ngraph::PartialShape::dynamic(), {3}, MAX, true); - ASSERT_NO_THROW(ngraph::pass::ConvertReduceToPooling().run_on_function(f)); + ngraph::pass::Manager manager; + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); } #undef MAX diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp index b40c4dc4e6c..31fbb691f84 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp @@ -22,6 +22,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace testing; std::shared_ptr get_initial_function(const ngraph::PartialShape & data_shape, @@ -82,9 +84,11 @@ void test(std::shared_ptr f, std::shared_ptr manager.register_pass(); manager.register_pass(); manager.register_pass(unh); - manager.run_passes(f); - ASSERT_NO_THROW(check_rt_info(f)); - ngraph::pass::ConstantFolding().run_on_function(f); + manager.register_pass([](std::shared_ptr f) { + check_rt_info(f); + }); + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); auto fc = FunctionsComparator::no_default().enable(FunctionsComparator::PRECISIONS); auto res = fc.compare(f, f_ref); diff --git a/inference-engine/tests/functional/inference_engine/transformations/keep_constant_inputs_tests.cpp b/inference-engine/tests/functional/inference_engine/transformations/keep_constant_inputs_tests.cpp index 93f91995506..bb97268d787 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/keep_constant_inputs_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/keep_constant_inputs_tests.cpp @@ -23,6 +23,8 @@ #include #include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" +#include + using namespace testing; using namespace InferenceEngine; @@ -44,10 +46,12 @@ int numberOfInputsForLayerInCNNNetwork(const InferenceEngine::CNNNetwork & netwo void transformNetwork(InferenceEngine::CNNNetwork & clonedNetwork, bool keep_constant_inputs) { if (clonedNetwork.getFunction()) { auto nGraphFunc = clonedNetwork.getFunction(); - ngraph::pass::CommonOptimizations().run_on_function(nGraphFunc); - ngraph::pass::ConvertOpSet3ToOpSet2().run_on_function(nGraphFunc); - ngraph::pass::ConvertOpSet2ToOpSet1().run_on_function(nGraphFunc); - ngraph::pass::ConvertOpSet1ToLegacy().run_on_function(nGraphFunc); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.run_passes(nGraphFunc); IE_SUPPRESS_DEPRECATED_START clonedNetwork = InferenceEngine::CNNNetwork( InferenceEngine::details::convertFunctionToICNNNetwork(nGraphFunc, clonedNetwork, keep_constant_inputs)); diff --git a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp index d2e8dd0cb4f..9358886a63a 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp @@ -28,6 +28,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" #include "lpt_ngraph_functions/common/builders.hpp" +#include + using namespace testing; using InputShape = ngraph::PartialShape; @@ -148,9 +150,11 @@ TEST_P(MulAddConversionTests, CompareFunctions) { manager.register_pass(); manager.register_pass(); manager.register_pass(unh); - manager.run_passes(f); - ASSERT_NO_THROW(check_rt_info(f)); - ngraph::pass::ConstantFolding().run_on_function(f); + manager.register_pass([](std::shared_ptr f) { + check_rt_info(f); + }); + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); f->validate_nodes_and_infer_types(); auto fc = FunctionsComparator::no_default().enable(FunctionsComparator::PRECISIONS); @@ -166,9 +170,12 @@ TEST_P(MulOrAddConversionTests, CompareFunctions) { manager.register_pass(); manager.register_pass(); manager.register_pass(unh); - manager.run_passes(f); - ASSERT_NO_THROW(check_rt_info(f)); - ngraph::pass::ConstantFolding().run_on_function(f); + manager.register_pass([](std::shared_ptr f) { + check_rt_info(f); + }); + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); + f->validate_nodes_and_infer_types(); auto fc = FunctionsComparator::no_default().enable(FunctionsComparator::PRECISIONS); diff --git a/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp index 841f3103187..72bbbcf64a5 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp @@ -21,6 +21,8 @@ #include #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace testing; using namespace ngraph; @@ -36,10 +38,14 @@ TEST(TransformationTests, ConvReshapeTest1) { auto conv = std::make_shared(input, w, strides, dilations, pads_begin, pads_end, ngraph::element::f32, 1); f = std::make_shared(ngraph::NodeVector{conv}, ngraph::ParameterVector{}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::Reshape1DOps().run_on_function(f); - ASSERT_NO_THROW(check_rt_info(f)); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.register_pass([](std::shared_ptr f) { + check_rt_info(f); + }); + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); } std::vector ref_shape{1, 6, 1, 62}; @@ -69,10 +75,14 @@ TEST(TransformationTests, ConvBiasReshapeTest1) { auto conv = std::make_shared(input, w, b, strides, dilations, pads_begin, pads_end, ngraph::element::f32, 1); f = std::make_shared(ngraph::NodeVector{conv}, ngraph::ParameterVector{}); - ngraph::pass::InitNodeInfo().run_on_function(f); - ngraph::pass::Reshape1DOps().run_on_function(f); - ASSERT_NO_THROW(check_rt_info(f)); - ngraph::pass::ConstantFolding().run_on_function(f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.register_pass(); + manager.register_pass([](std::shared_ptr f) { + check_rt_info(f); + }); + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); } std::vector ref_shape{1, 6, 1, 62}; diff --git a/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp b/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp index 1bab10d9b4a..ef654188194 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp @@ -21,6 +21,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +#include + using namespace ngraph; using namespace std; @@ -559,7 +561,9 @@ TEST(nop_elimination, unsqueeze_squeeze_elimination) { auto check_usecase = [&](const Shape& shape, const std::vector& axes_val) { auto baseline_f = generate_func(shape, axes_val); auto optimized_f = generate_func(shape, axes_val); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -589,7 +593,9 @@ TEST(nop_elimination, reshape_unsqueeze_elimination) { auto B1 = make_shared(B, axes); auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -618,7 +624,9 @@ TEST(nop_elimination, reshape_squeeze_elimination) { auto B1 = make_shared(B, axes); auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -644,7 +652,9 @@ TEST(nop_elimination, reshape_reshape_elimination) { auto B1 = make_shared(B, pat2, true); auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 2); ASSERT_EQ(count_ops_of_type(optimized_f), 1); @@ -669,7 +679,9 @@ TEST(nop_elimination, squeeze_reshape_elimination) { auto B1 = make_shared(B, pat2, false); auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -695,7 +707,9 @@ TEST(nop_elimination, unsqueeze_reshape_elimination) { auto B1 = make_shared(B, pat2, false); auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -716,8 +730,9 @@ TEST(nop_elimination, squeeze_unsqueeze_elimination_negative) { auto squeeze = make_shared(input, indices); auto baseline_f = make_shared(squeeze, ParameterVector{input}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); - + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(optimized_f), 1); }; @@ -733,7 +748,9 @@ TEST(nop_elimination, topk_convert_elimination) { auto C = make_shared(B->output(0), B->output(0).get_element_type()); auto baseline_f = make_shared(make_shared(C), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); - pass::NopElimination().run_on_function(optimized_f); + ngraph::pass::Manager manager; + manager.register_pass(); + manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(optimized_f), 0); diff --git a/inference-engine/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp b/inference-engine/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp index 810fa36999e..2aac9814090 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp @@ -8,6 +8,7 @@ #include #include +#include namespace element = ngraph::element; using std::make_shared; @@ -328,8 +329,9 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck) { auto relaxed_equal = make_shared>(equal, TypeVector{}, TypeVector{ element::u8 }); f = make_shared(ngraph::OutputVector{ relaxed_equal }, ngraph::ParameterVector{}); - - ASSERT_NO_THROW(ngraph::pass::ConstantFolding().run_on_function(f)); + ngraph::pass::Manager manager; + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); auto layer_before_result = f->get_result()->get_input_node_shared_ptr(0); ASSERT_TRUE(ngraph::is_type(layer_before_result)); } @@ -344,8 +346,9 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck1) { auto relaxed_equal = make_shared>(equal, TypeVector{}, TypeVector{ element::boolean }); f = make_shared(ngraph::OutputVector{ relaxed_equal }, ngraph::ParameterVector{}); - - ASSERT_NO_THROW(ngraph::pass::ConstantFolding().run_on_function(f)); + ngraph::pass::Manager manager; + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); auto layer_before_result = f->get_result()->get_input_node_shared_ptr(0); ASSERT_TRUE(ngraph::is_type(layer_before_result)); } @@ -365,8 +368,9 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck2) { ngraph::op::TemporaryReplaceOutputType(const2, element::i32).get()); f = make_shared(ngraph::OutputVector{ relaxed_equal }, ngraph::ParameterVector{}); - - ASSERT_NO_THROW(ngraph::pass::ConstantFolding().run_on_function(f)); + ngraph::pass::Manager manager; + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); auto layer_before_result = f->get_result()->get_input_node_shared_ptr(0); ASSERT_TRUE(ngraph::is_type(layer_before_result)); } @@ -383,8 +387,9 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck3) { auto relaxed_equal = make_shared>(equal, original_input_types, TypeVector{ element::u8 }); f = make_shared(ngraph::OutputVector{ relaxed_equal }, ngraph::ParameterVector{}); - - ASSERT_NO_THROW(ngraph::pass::ConstantFolding().run_on_function(f)); + ngraph::pass::Manager manager; + manager.register_pass(); + ASSERT_NO_THROW(manager.run_passes(f)); auto layer_before_result = f->get_result()->get_input_node_shared_ptr(0); ASSERT_TRUE(ngraph::is_type(layer_before_result)); }