From a2e49469b5da50f5584e5aafefa169e3d1f7b65d Mon Sep 17 00:00:00 2001 From: Irina Efode Date: Tue, 20 Oct 2020 14:31:59 +0300 Subject: [PATCH] Cleanup single_layer_tests (#2716) --- .../single_layer_tests/equal.cpp | 30 ------------ .../single_layer_tests/greater.cpp | 30 ------------ .../shared/include/single_layer_tests/equal.hpp | 35 -------------- .../shared/include/single_layer_tests/greater.hpp | 35 -------------- .../plugin/shared/src/single_layer_tests/equal.cpp | 56 ---------------------- .../shared/src/single_layer_tests/greater.cpp | 56 ---------------------- .../ngraph_functions/utils/ngraph_helpers.hpp | 3 +- .../tests/ngraph_functions/src/eltwise.cpp | 2 + 8 files changed, 4 insertions(+), 243 deletions(-) delete mode 100644 inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/equal.cpp delete mode 100644 inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/greater.cpp delete mode 100644 inference-engine/tests/functional/plugin/shared/include/single_layer_tests/equal.hpp delete mode 100644 inference-engine/tests/functional/plugin/shared/include/single_layer_tests/greater.hpp delete mode 100644 inference-engine/tests/functional/plugin/shared/src/single_layer_tests/equal.cpp delete mode 100644 inference-engine/tests/functional/plugin/shared/src/single_layer_tests/greater.cpp diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/equal.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/equal.cpp deleted file mode 100644 index ffd20a2..0000000 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/equal.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "single_layer_tests/equal.hpp" - -#include "common_test_utils/test_constants.hpp" - -#include - -using namespace LayerTestsDefinitions; - -namespace { - -std::vector> inShapes = { - {{200}, {200}}, - {{1000}, {1}}, - {{1, 256, 512}, {1, 256, 512}}, - {{1}, {1, 256, 512}}, -}; - -INSTANTIATE_TEST_CASE_P(smoke_equalS32, EqualLayerTest, - ::testing::Combine( - ::testing::ValuesIn(inShapes), - ::testing::Values(InferenceEngine::Precision::I32), - ::testing::Values(InferenceEngine::Precision::I32), - ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), - EqualLayerTest::getTestCaseName); - -} // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/greater.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/greater.cpp deleted file mode 100644 index 14d693d..0000000 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/greater.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "single_layer_tests/greater.hpp" - -#include "common_test_utils/test_constants.hpp" - -#include - -using namespace LayerTestsDefinitions; - -namespace { - -std::vector> inShapes = { - {{200}, {200}}, - {{1000}, {1}}, - {{1, 256, 512}, {1, 256, 512}}, - {{1}, {1, 256, 512}}, -}; - -INSTANTIATE_TEST_CASE_P(smoke_greaterS32, GreaterLayerTest, - ::testing::Combine( - ::testing::ValuesIn(inShapes), - ::testing::Values(InferenceEngine::Precision::FP16), - ::testing::Values(InferenceEngine::Precision::I32), - ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), - GreaterLayerTest::getTestCaseName); - -} // namespace diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/equal.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/equal.hpp deleted file mode 100644 index 8985f16..0000000 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/equal.hpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include -#include -#include -#include -#include - -namespace LayerTestsDefinitions { - -using EqualTestParam = typename std::tuple< - std::vector, // Input shapes - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - LayerTestsUtils::TargetDevice>; // Config - -class EqualLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/greater.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/greater.hpp deleted file mode 100644 index 32b3b9b..0000000 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/greater.hpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "functional_test_utils/layer_test_utils.hpp" - -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/ngraph_helpers.hpp" - -#include -#include -#include -#include -#include - -namespace LayerTestsDefinitions { - -using GreaterTestParam = typename std::tuple< - std::vector, // Input shapes - InferenceEngine::Precision, // Input precision - InferenceEngine::Precision, // Output precision - LayerTestsUtils::TargetDevice>; // Config - -class GreaterLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); - -protected: - void SetUp() override; -}; - -} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/equal.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/equal.cpp deleted file mode 100644 index e92bb68..0000000 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/equal.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "single_layer_tests/equal.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include -#include -#include -#include -#include - - -namespace LayerTestsDefinitions { - -std::string EqualLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision inPrecision; - InferenceEngine::Precision outPrecision; - std::vector inputShapes; - std::string targetDevice; - - std::tie(inputShapes, inPrecision, outPrecision, targetDevice) = obj.param; - - std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; - result << "inPrc=" << inPrecision.name() << "_"; - result << "outPrc=" << outPrecision.name() << "_"; - result << "targetDevice=" << targetDevice; - - return result.str(); -} - -void EqualLayerTest::SetUp() { - std::vector inputShapes; - InferenceEngine::Precision inputPrecision = InferenceEngine::Precision::UNSPECIFIED; - - std::tie(inputShapes, inputPrecision, outPrc, targetDevice) = this->GetParam(); - - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); - auto paramsVector = ngraph::builder::makeParams(ngPrc, {inputShapes}); - IE_ASSERT(paramsVector.size() == 2); - - auto equalOp = std::make_shared(paramsVector[0], paramsVector[1]); - ngraph::ResultVector results{std::make_shared(equalOp)}; - - function = std::make_shared(results, paramsVector, "Equal"); -} - -TEST_P(EqualLayerTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/greater.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/greater.cpp deleted file mode 100644 index 8687c71..0000000 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/greater.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "single_layer_tests/greater.hpp" - -#include "functional_test_utils/blob_utils.hpp" -#include "functional_test_utils/layer_test_utils.hpp" -#include "common_test_utils/common_utils.hpp" - -#include -#include -#include -#include -#include - - -namespace LayerTestsDefinitions { - -std::string GreaterLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision inPrecision; - InferenceEngine::Precision outPrecision; - std::vector inputShapes; - std::string targetDevice; - - std::tie(inputShapes, inPrecision, outPrecision, targetDevice) = obj.param; - - std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; - result << "inPrc=" << inPrecision.name() << "_"; - result << "outPrc=" << outPrecision.name() << "_"; - result << "targetDevice=" << targetDevice; - - return result.str(); -} - -void GreaterLayerTest::SetUp() { - std::vector inputShapes; - InferenceEngine::Precision inputPrecision = InferenceEngine::Precision::UNSPECIFIED; - - std::tie(inputShapes, inputPrecision, outPrc, targetDevice) = this->GetParam(); - - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); - auto paramsVector = ngraph::builder::makeParams(ngPrc, {inputShapes}); - IE_ASSERT(paramsVector.size() == 2); - - auto equalOp = std::make_shared(paramsVector[0], paramsVector[1]); - ngraph::ResultVector results{std::make_shared(equalOp)}; - - function = std::make_shared(results, paramsVector, "Greater"); -} - -TEST_P(GreaterLayerTest, CompareWithRefs) { - Run(); -} -} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp b/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp index 9a32f22..2114f3f 100644 --- a/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp +++ b/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp @@ -122,7 +122,8 @@ enum EltwiseTypes { DIVIDE, SQUARED_DIFF, POWER, - FLOOR_MOD + FLOOR_MOD, + MOD }; enum ComparisonTypes { diff --git a/inference-engine/tests/ngraph_functions/src/eltwise.cpp b/inference-engine/tests/ngraph_functions/src/eltwise.cpp index 9a2a52e..1ed6693 100644 --- a/inference-engine/tests/ngraph_functions/src/eltwise.cpp +++ b/inference-engine/tests/ngraph_functions/src/eltwise.cpp @@ -29,6 +29,8 @@ std::shared_ptr makeEltwise(const ngraph::Output &in0, return std::make_shared(in0, in1); case ngraph::helpers::EltwiseTypes::FLOOR_MOD: return std::make_shared(in0, in1); + case ngraph::helpers::EltwiseTypes::MOD: + return std::make_shared(in0, in1); default: { throw std::runtime_error("Incorrect type of Eltwise operation"); } -- 2.7.4