From 86f10b5c11a4e8def9cd36d9e6be9953129fc45a Mon Sep 17 00:00:00 2001 From: "Efode, Irina" Date: Mon, 18 Oct 2021 14:46:41 +0300 Subject: [PATCH] Remove In,OutPrecision --- .../single_layer_tests/eltwise.cpp | 6 --- .../single_layer_tests/softmax.cpp | 8 ---- .../single_layer_tests/eltwise.cpp | 6 --- .../single_layer_tests/softmax.cpp | 8 ---- .../single_layer_tests/eltwise.cpp | 2 - .../single_layer_tests/eltwise.cpp | 2 - .../single_layer_tests/softmax.cpp | 4 -- .../single_layer_tests/eltwise.cpp | 4 -- .../shared_test_classes/base/ov_subgraph.hpp | 6 +-- .../single_layer/eltwise.hpp | 2 - .../single_layer/softmax.hpp | 4 +- .../src/base/ov_subgraph.cpp | 37 ++----------------- .../src/single_layer/eltwise.cpp | 8 ++-- .../src/single_layer/softmax.cpp | 9 ++--- .../ngraph_functions/utils/ngraph_helpers.hpp | 2 + .../src/utils/ngraph_helpers.cpp | 30 ++++++++------- 16 files changed, 31 insertions(+), 107 deletions(-) diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp index 6748a8c04bf..c946b5404f2 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -79,8 +79,6 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(additional_config)); @@ -90,8 +88,6 @@ const auto multiply_params_dynamic = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypesDynamic), ::testing::ValuesIn(opTypesDynamic), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(additional_config)); @@ -120,8 +116,6 @@ const auto single_thread_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(additional_config_single_thread)); diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index 39e8d17ffed..c916eaa65c6 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp @@ -34,8 +34,6 @@ const std::vector axis2D = { const auto params2D_static = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputStaticShape2D)), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -44,8 +42,6 @@ const auto params2D_static = testing::Combine( const auto params2D_dynamic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(inputDynamicShape2D), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -82,8 +78,6 @@ const std::vector axis4D = {0, 1, 2, 3}; const auto params4Dstatic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputStaticShape4D)), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -92,8 +86,6 @@ const auto params4Dstatic = testing::Combine( const auto params4Ddynamic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(inputDynamicShape4D), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_TEMPLATE), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp index b9c5a586aa9..a82e4235552 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -79,8 +79,6 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); @@ -90,8 +88,6 @@ const auto multiply_params_dynamic = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypesDynamic), ::testing::ValuesIn(opTypesDynamic), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); @@ -120,8 +116,6 @@ const auto single_thread_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::Type_t::undefined), - ::testing::Values(ov::element::Type_t::undefined), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config_single_thread)); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp index d160e4169a4..76923f7a893 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -34,8 +34,6 @@ const std::vector axis2D = { const auto params2D_static = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::Type_t::undefined), - testing::Values(ov::element::Type_t::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputStaticShape2D)), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_CPU), @@ -44,8 +42,6 @@ const auto params2D_static = testing::Combine( const auto params2D_dynamic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::Type_t::undefined), - testing::Values(ov::element::Type_t::undefined), testing::ValuesIn(inputDynamicShape2D), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_CPU), @@ -82,8 +78,6 @@ const std::vector axis4D = {0, 1, 2, 3}; const auto params4Dstatic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::Type_t::undefined), - testing::Values(ov::element::Type_t::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputStaticShape4D)), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_CPU), @@ -92,8 +86,6 @@ const auto params4Dstatic = testing::Combine( const auto params4Ddynamic = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::Type_t::undefined), - testing::Values(ov::element::Type_t::undefined), testing::ValuesIn(inputDynamicShape4D), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp index e065d8597f6..6e728794aba 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -53,8 +53,6 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::undefined), - ::testing::Values(ov::element::undefined), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp index df698303262..7c55f2c9c3f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -60,8 +60,6 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::element::undefined), - ::testing::Values(ov::element::undefined), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp index bd473d1d0ec..1997ec55abd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -27,8 +27,6 @@ const std::vector axis2D = { const auto params2D = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes2D)), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_GPU), @@ -52,8 +50,6 @@ const std::vector axis4D = {0, 1, 2, 3}; const auto params4D = testing::Combine( testing::ValuesIn(netPrecisions), - testing::Values(ov::element::undefined), - testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes4D)), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp index 05b4c4cb88d..779ba8cf901 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -63,8 +63,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_EltwiseMathFP, ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(fpTypes), - ::testing::Values(ov::element::undefined), - ::testing::Values(ov::element::undefined), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), EltwiseLayerTest::getTestCaseName); @@ -77,8 +75,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_EltwiseMathInt, ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(intTypes), - ::testing::Values(ov::element::undefined), - ::testing::Values(ov::element::undefined), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), EltwiseLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp index 1f64666f91d..c93b232fbac 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp @@ -27,7 +27,7 @@ public: void TearDown() override { if (!configuration.empty()) { - ov::test::PluginCache::get().core().reset(); + ov::test::utils::PluginCache::get().core().reset(); } } @@ -44,12 +44,11 @@ protected: void init_input_shapes(const InputShapes& shapes); void init_input_shapes(const InputShape& shapes); - std::shared_ptr core = ov::test::PluginCache::get().core(); + std::shared_ptr core = ov::test::utils::PluginCache::get().core(); std::string targetDevice; Config configuration; std::shared_ptr function, functionRefs = nullptr; - ElementType inType = ov::element::Type_t::undefined, outType = ov::element::Type_t::undefined; std::map inputs; std::vector inputDynamicShapes; std::vector> targetStaticShapes; @@ -64,7 +63,6 @@ protected: LayerTestsUtils::Summary& summary = LayerTestsUtils::Summary::getInstance();; private: - void resize_function(const std::vector& targetInputStaticShapes); std::vector calculate_refs(); std::vector get_plugin_outputs(); }; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp index d2b130efffc..9b97a7d4352 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/eltwise.hpp @@ -17,8 +17,6 @@ typedef std::tuple< ngraph::helpers::InputLayerType, // secondary input type CommonTestUtils::OpType, // op type ElementType, // Net precision - ElementType, // Input precision - ElementType, // Output precision TargetDevice, // Device name Config // Additional network configuration > EltwiseTestParams; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp index 5774f79471e..08c4a7e3d71 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp @@ -12,9 +12,7 @@ namespace subgraph { using SoftMaxTestParams = std::tuple< ElementType, // netPrecision - ElementType, // Input precision - ElementType, // Output precision - InputShape, // Dynamic shape + Target static shapes + InputShape, // Dynamic shape + Target static shapes size_t, // axis TargetDevice, // targetDevice Config // config diff --git a/inference-engine/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp index 7f44d0c08ae..e0f2589db2e 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp @@ -47,7 +47,7 @@ void SubgraphBaseTest::run() { try { if (!inputDynamicShapes.empty()) { // resize ngraph function according new target shape - resize_function(targetStaticShapeVec); + ngraph::helpers::resize_function(targetStaticShapeVec, functionRefs); } generate_inputs(targetStaticShapeVec); infer(); @@ -121,27 +121,7 @@ void SubgraphBaseTest::compare(const std::vector &expected, } } -void SubgraphBaseTest::configure_model() { - // configure input precision - { - auto params = function->get_parameters(); - for (auto& param : params) { - if (inType != ov::element::Type_t::undefined) { - param->get_output_tensor(0).set_element_type(inType); - } - } - } - - // configure output precision - { - auto results = function->get_results(); - for (auto& result : results) { - if (outType != ov::element::Type_t::undefined) { - result->get_output_tensor(0).set_element_type(outType); - } - } - } -} +void SubgraphBaseTest::configure_model() {} void SubgraphBaseTest::compile_model() { configure_model(); @@ -182,7 +162,7 @@ std::vector SubgraphBaseTest::calculate_refs() { std::vector SubgraphBaseTest::get_plugin_outputs() { auto outputs = std::vector{}; for (const auto& output : executableNetwork.outputs()) { - const auto& name = *output.get_tensor().get_names().begin(); + const auto& name = output.get_tensor().get_any_name(); outputs.push_back(inferRequest.get_tensor(name)); } return outputs; @@ -202,17 +182,6 @@ void SubgraphBaseTest::validate() { compare(expectedOutputs, actualOutputs); } -void SubgraphBaseTest::resize_function(const std::vector& targetInputStaticShapes) { - auto params = function->get_parameters(); - std::map shapes; - ASSERT_LE(params.size(), targetInputStaticShapes.size()); - for (size_t i = 0; i < params.size(); i++) { - shapes.insert({*params[i]->get_output_tensor(0).get_names().begin(), targetInputStaticShapes[i]}); - } - function->reshape(shapes); - functionRefs->reshape(shapes); -} - void SubgraphBaseTest::init_input_shapes(const InputShapes& shapes) { targetStaticShapes = shapes.second; if (!shapes.first.empty()) { diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp index 90db8868f26..a3c13807534 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/eltwise.cpp @@ -12,13 +12,13 @@ namespace subgraph { std::string EltwiseLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { std::pair, std::vector>> shapes; - ElementType netType, inType, outType; + ElementType netType; ngraph::helpers::InputLayerType secondaryInputType; CommonTestUtils::OpType opType; ngraph::helpers::EltwiseTypes eltwiseOpType; std::string targetName; std::map additional_config; - std::tie(shapes, eltwiseOpType, secondaryInputType, opType, netType, inType, outType, targetName, additional_config) = obj.param; + std::tie(shapes, eltwiseOpType, secondaryInputType, opType, netType, targetName, additional_config) = obj.param; std::ostringstream results; results << "IS=" << CommonTestUtils::partialShape2str(shapes.first) << "_"; @@ -34,8 +34,6 @@ std::string EltwiseLayerTest::getTestCaseName(const testing::TestParamInfoget_friendly_name() + "was nor find in input parameters"); } auto input = inputIt->second; - const auto inType = input.get_element_type(); -// TODO: iefode -// if (inType != element::undefined && inType != parameterType) { -// input = convertOutputPrecision(input, inType, parameterType, shape_size(parameterShape)); -// } - -// const auto &inputSize = input.size(); -// NGRAPH_CHECK(parameterSize == inputSize, -// "Got parameter (", parameter->get_friendly_name(), ") of size ", parameterSize, -// " bytes, but corresponding input with index ", parameterIndex, -// " has ", inputSize, " bytes"); + const auto &inputSize = input.get_size(); + NGRAPH_CHECK(parameterSize == inputSize, + "Got parameter (", parameter->get_friendly_name(), ") of size ", parameterSize, + " bytes, but corresponding input with index ", parameterIndex, + " has ", inputSize, " bytes"); auto tensor = backend->create_tensor(parameterType, parameterShape); tensor->write(input.data(), parameterSize); @@ -908,5 +903,14 @@ std::ostream& operator<<(std::ostream & os, MemoryTransformation type) { return os; } +void resize_function(const std::vector& targetInputStaticShapes, std::shared_ptr function) { + auto params = function->get_parameters(); + std::map shapes; + for (size_t i = 0; i < params.size(); i++) { + shapes.insert({params[i]->get_output_tensor(0).get_any_name(), targetInputStaticShapes[i]}); + } + function->reshape(shapes); +} + } // namespace helpers } // namespace ngraph