diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp index 14df1ece269..4bc10a59632 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp @@ -7,13 +7,12 @@ #include "subgraph_tests/quantized_group_convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" -using namespace SubgraphTestsDefinitions; +using namespace ov::test; +using namespace ov::test::utils; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 -}; +const std::vector netPrecisions = {ov::element::f32}; const std::vector numOutChannels = {16, 32}; const std::vector numGroups = {2, 8, 16}; @@ -24,12 +23,12 @@ const std::vector granularity = { ov::test::utils::QuantizationGranularity::Perchannel}; /* ============= 2D GroupConvolutionBackpropData ============= */ -const std::vector> inputShapes2D = {{1, 16, 10, 10}, {1, 32, 10, 10}}; -const std::vector> kernels2D = {{1, 1}, {3, 3}}; -const std::vector> strides2D = {{1, 1}}; +const std::vector inputShapes2D = {{1, 16, 10, 10}, {1, 32, 10, 10}}; +const std::vector kernels2D = {{1, 1}, {3, 3}}; +const std::vector strides2D = {{1, 1}}; const std::vector> padBegins2D = {{0, 0}}; const std::vector> padEnds2D = {{0, 0}}; -const std::vector> dilations2D = {{1, 1}}; +const std::vector dilations2D = {{1, 1}}; const auto quantGroupConvBackpropData2DParams = ::testing::Combine( @@ -40,7 +39,7 @@ const auto quantGroupConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(dilations2D), ::testing::ValuesIn(numOutChannels), ::testing::ValuesIn(numGroups), - ::testing::Values(ngraph::op::PadType::AUTO), + ::testing::Values(ov::op::PadType::AUTO), ::testing::ValuesIn(levels), ::testing::ValuesIn(granularity) ); @@ -54,12 +53,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackp QuantGroupConvBackpropDataLayerTest::getTestCaseName); /* ============= 3D GroupConvolutionBackpropData ============= */ -const std::vector> inputShapes3D = {{1, 16, 5, 5, 5}, {1, 32, 5, 5, 5}}; -const std::vector> kernels3D = {{3, 3, 3}}; -const std::vector> strides3D = {{1, 1, 1}}; +const std::vector inputShapes3D = {{1, 16, 5, 5, 5}, {1, 32, 5, 5, 5}}; +const std::vector kernels3D = {{3, 3, 3}}; +const std::vector strides3D = {{1, 1, 1}}; const std::vector> padBegins3D = {{0, 0, 0}}; const std::vector> padEnds3D = {{0, 0, 0}}; -const std::vector> dilations3D = {{1, 1, 1}}; +const std::vector dilations3D = {{1, 1, 1}}; const auto quantGroupConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(kernels3D), @@ -69,7 +68,7 @@ const auto quantGroupConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(dilations3D), ::testing::ValuesIn(numOutChannels), ::testing::ValuesIn(numGroups), - ::testing::Values(ngraph::op::PadType::AUTO), + ::testing::Values(ov::op::PadType::AUTO), ::testing::ValuesIn(levels), ::testing::ValuesIn(granularity) ); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp index bfd987be299..e06ae6690d4 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp @@ -7,28 +7,26 @@ #include "subgraph_tests/quantized_group_convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" -using namespace SubgraphTestsDefinitions; -using namespace ngraph::helpers; +using namespace ov::test; +using namespace ov::test::utils; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 -}; +const std::vector element_types = {ov::element::f32}; const std::vector numOutChannels = {16, 32}; const std::vector numGroups = {2, 8, 16}; -const std::vector levels = {256}; +const std::vector levels = {256}; const std::vector granularity = {QuantizationGranularity::Pertensor, QuantizationGranularity::Perchannel}; /* ============= 2D GroupConvolutionBackpropData ============= */ -const std::vector> inputShapes2D = {{1, 16, 10, 10}, {1, 32, 10, 10}}; -const std::vector> kernels2D = {{1, 1}, {3, 3}}; -const std::vector> strides2D = {{1, 1}}; +const std::vector inputShapes2D = {{1, 16, 10, 10}, {1, 32, 10, 10}}; +const std::vector kernels2D = {{1, 1}, {3, 3}}; +const std::vector strides2D = {{1, 1}}; const std::vector> padBegins2D = {{0, 0}}; const std::vector> padEnds2D = {{0, 0}}; -const std::vector> dilations2D = {{1, 1}}; +const std::vector dilations2D = {{1, 1}}; const auto quantGroupConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(kernels2D), @@ -46,18 +44,18 @@ const auto quantGroupConvBackpropData2DParams = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData2DParams, - ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(element_types), ::testing::ValuesIn(inputShapes2D), ::testing::Values(ov::test::utils::DEVICE_GPU)), QuantGroupConvBackpropDataLayerTest::getTestCaseName); /* ============= 3D GroupConvolutionBackpropData ============= */ -const std::vector> inputShapes3D = {{1, 16, 5, 5, 5}, {1, 32, 5, 5, 5}}; -const std::vector> kernels3D = {{3, 3, 3}}; -const std::vector> strides3D = {{1, 1, 1}}; +const std::vector inputShapes3D = {{1, 16, 5, 5, 5}, {1, 32, 5, 5, 5}}; +const std::vector kernels3D = {{3, 3, 3}}; +const std::vector strides3D = {{1, 1, 1}}; const std::vector> padBegins3D = {{0, 0, 0}}; const std::vector> padEnds3D = {{0, 0, 0}}; -const std::vector> dilations3D = {{1, 1, 1}}; +const std::vector dilations3D = {{1, 1, 1}}; const auto quantGroupConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(kernels3D), @@ -75,7 +73,7 @@ const auto quantGroupConvBackpropData3DParams = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData3D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData3DParams, - ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(element_types), ::testing::ValuesIn(inputShapes3D), ::testing::Values(ov::test::utils::DEVICE_GPU)), QuantGroupConvBackpropDataLayerTest::getTestCaseName); diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp index f4dfae76c9e..6e58f623a33 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/quantized_group_convolution_backprop_data.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(QuantGroupConvBackpropDataLayerTest, CompareWithRefs) { - Run(); + run(); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp index a006151d2e5..a1d68b181d4 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp @@ -9,31 +9,31 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" -#include "ov_models/builders.hpp" -#include "ov_models/utils/ov_helpers.hpp" +#include "common_test_utils/test_enums.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { typedef std::tuple< - InferenceEngine::SizeVector, - InferenceEngine::SizeVector, + ov::Shape, + ov::Shape, std::vector, std::vector, - InferenceEngine::SizeVector, + ov::Shape, size_t, size_t, - ngraph::op::PadType, + ov::op::PadType, size_t, ov::test::utils::QuantizationGranularity> quantGroupConvBackpropDataSpecificParams; typedef std::tuple< quantGroupConvBackpropDataSpecificParams, - InferenceEngine::Precision, - InferenceEngine::SizeVector, - LayerTestsUtils::TargetDevice> quantGroupConvBackpropDataLayerTestParamsSet; + ov::element::Type, + ov::Shape, + std::string> quantGroupConvBackpropDataLayerTestParamsSet; class QuantGroupConvBackpropDataLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { + virtual public ov::test::SubgraphBaseStaticTest { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); @@ -41,4 +41,5 @@ protected: void SetUp() override; }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp b/src/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp index 7e95b6de3ac..a9795238917 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/quantized_group_convolution_backprop_data.cpp @@ -3,17 +3,20 @@ // #include "shared_test_classes/subgraph/quantized_group_convolution_backprop_data.hpp" +#include "ov_models/builders.hpp" +#include "ov_models/utils/ov_helpers.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { std::string QuantGroupConvBackpropDataLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { quantGroupConvBackpropDataSpecificParams groupConvBackpropDataParams; - InferenceEngine::Precision netPrecision; - InferenceEngine::SizeVector inputShapes; + ov::element::Type element_type; + ov::Shape inputShapes; std::string targetDevice; - std::tie(groupConvBackpropDataParams, netPrecision, inputShapes, targetDevice) = obj.param; - ngraph::op::PadType padType; - InferenceEngine::SizeVector kernel, stride, dilation; + std::tie(groupConvBackpropDataParams, element_type, inputShapes, targetDevice) = obj.param; + ov::op::PadType padType; + ov::Shape kernel, stride, dilation; std::vector padBegin, padEnd; size_t convOutChannels, numGroups; size_t quantLevels; @@ -32,32 +35,29 @@ std::string QuantGroupConvBackpropDataLayerTest::getTestCaseName(const testing:: result << "AP=" << padType << "_"; result << "Levels=" << quantLevels << "_"; result << "QG=" << quantGranularity << "_"; - result << "netPRC=" << netPrecision.name() << "_"; + result << "ET=" << element_type.get_type_name() << "_"; result << "targetDevice=" << targetDevice; return result.str(); } void QuantGroupConvBackpropDataLayerTest::SetUp() { - threshold = 0.5f; - quantGroupConvBackpropDataSpecificParams groupConvBackpropDataParams; - std::vector inputShape; - auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; - std::tie(groupConvBackpropDataParams, netPrecision, inputShape, targetDevice) = this->GetParam(); - ngraph::op::PadType padType; - InferenceEngine::SizeVector kernel, stride, dilation; + ov::Shape inputShape; + ov::element::Type element_type = ov::element::undefined; + std::tie(groupConvBackpropDataParams, element_type, inputShape, targetDevice) = this->GetParam(); + ov::op::PadType padType; + ov::Shape kernel, stride, dilation; std::vector padBegin, padEnd; size_t convOutChannels, numGroups; size_t quantLevels; ov::test::utils::QuantizationGranularity quantGranularity; std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, numGroups, padType, quantLevels, quantGranularity) = groupConvBackpropDataParams; - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - ov::ParameterVector params{std::make_shared(ngPrc, ov::Shape(inputShape))}; + ov::ParameterVector params{std::make_shared(element_type, ov::Shape(inputShape))}; std::vector dataFqConstShapes(inputShape.size(), 1); if (quantGranularity == ov::test::utils::QuantizationGranularity::Perchannel) dataFqConstShapes[1] = inputShape[1]; - auto dataFq = ngraph::builder::makeFakeQuantize(params[0], ngPrc, quantLevels, dataFqConstShapes); + auto dataFq = ngraph::builder::makeFakeQuantize(params[0], element_type, quantLevels, dataFqConstShapes); std::vector weightsShapes = {inputShape[1], convOutChannels}; if (weightsShapes[0] % numGroups || weightsShapes[1] % numGroups) @@ -68,18 +68,19 @@ void QuantGroupConvBackpropDataLayerTest::SetUp() { weightsShapes.insert(weightsShapes.end(), kernel.begin(), kernel.end()); std::vector weightsData; - auto weightsNode = ngraph::builder::makeConstant(ngPrc, weightsShapes, weightsData, weightsData.empty()); + auto weightsNode = ngraph::builder::makeConstant(element_type, weightsShapes, weightsData, weightsData.empty()); std::vector weightsFqConstShapes(weightsShapes.size(), 1); if (quantGranularity == ov::test::utils::QuantizationGranularity::Perchannel) weightsFqConstShapes[0] = weightsShapes[0]; - auto weightsFq = ngraph::builder::makeFakeQuantize(weightsNode, ngPrc, quantLevels, weightsFqConstShapes); + auto weightsFq = ngraph::builder::makeFakeQuantize(weightsNode, element_type, quantLevels, weightsFqConstShapes); auto groupConvBackpropData = std::dynamic_pointer_cast( - ngraph::builder::makeGroupConvolutionBackpropData(dataFq, weightsFq, ngPrc, stride, padBegin, padEnd, dilation, padType)); + ngraph::builder::makeGroupConvolutionBackpropData(dataFq, weightsFq, element_type, stride, padBegin, padEnd, dilation, padType)); - ngraph::ResultVector results{std::make_shared(groupConvBackpropData)}; - function = std::make_shared(results, params, "QuantGroupConvolutionBackpropData"); + ov::ResultVector results{std::make_shared(groupConvBackpropData)}; + function = std::make_shared(results, params, "QuantGroupConvolutionBackpropData"); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov