diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_detection_output.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_detection_output.cpp index 56544d186fe1d4..30f89bd9d90ff2 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_detection_output.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_detection_output.cpp @@ -2,20 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/experimental_detectron_detection_output.hpp" - -#include - -#include "common_test_utils/ov_tensor_utils.hpp" - -using namespace ov::test; -using namespace ov::test::subgraph; +#include "single_op_tests/experimental_detectron_detection_output.hpp" namespace { +using ov::test::ExperimentalDetectronDetectionOutputLayerTest; -const std::vector netPrecisions = { - ov::element::Type_t::f16, - ov::element::Type_t::f32, +const std::vector netPrecisions = { + ov::element::f16, + ov::element::f32, }; const std::vector score_threshold = {0.01f, 0.8f}; @@ -46,15 +40,15 @@ const bool class_agnostic_box_regression_false = false; // specifies deltas of weights const std::vector> deltas_weights = {{10.0f, 10.0f, 5.0f, 5.0f}}; -const std::vector> inputShapes = { +const std::vector inputShapes = { // inputRois / inputDeltas / inputScores / inputImInfos - static_shapes_to_test_representation({{16, 4}, {16, 8}, {16, 2}, {1, 3}}), + ov::test::static_shapes_to_test_representation({{16, 4}, {16, 8}, {16, 2}, {1, 3}}), }; INSTANTIATE_TEST_SUITE_P(smoke_ExperimentalDetectronDetectionOutput, ExperimentalDetectronDetectionOutputLayerTest, - ::testing::Combine(::testing::ValuesIn(inputShapes), + ::testing::Combine(::testing::Values(inputShapes), ::testing::ValuesIn(score_threshold), ::testing::ValuesIn(nms_threshold), ::testing::ValuesIn(max_delta_log_wh), @@ -69,7 +63,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ExperimentalDetectronDetectionOutput, INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_ExperimentalDetectronDetectionOutputMaxDetectionsPerImage, ExperimentalDetectronDetectionOutputLayerTest, - ::testing::Combine(::testing::ValuesIn(inputShapes), + ::testing::Combine(::testing::Values(inputShapes), ::testing::ValuesIn(score_threshold), ::testing::ValuesIn(nms_threshold), ::testing::ValuesIn(max_delta_log_wh), @@ -84,7 +78,7 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_ExperimentalDetectronDetectionOutputMaxD INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_ExperimentalDetectronDetectionOutput, ExperimentalDetectronDetectionOutputLayerTest, - ::testing::Combine(::testing::ValuesIn(inputShapes), + ::testing::Combine(::testing::Values(inputShapes), ::testing::ValuesIn(score_threshold), ::testing::ValuesIn(nms_threshold), ::testing::ValuesIn(max_delta_log_wh), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_generate_proposals_single_image.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_generate_proposals_single_image.cpp index eeffda94e066fe..d6517d48d13b8e 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_generate_proposals_single_image.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_generate_proposals_single_image.cpp @@ -2,195 +2,32 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include "single_layer_tests/experimental_detectron_generate_proposals_single_image.hpp" -#include "common_test_utils/ov_tensor_utils.hpp" - -using namespace ov::test; -using namespace ov::test::subgraph; +#include +#include "single_op_tests/experimental_detectron_generate_proposals_single_image.hpp" namespace { +using ov::test::ExperimentalDetectronGenerateProposalsSingleImageLayerTest; const std::vector min_size = { 0.0f, 0.1f }; const std::vector nms_threshold = { 0.7f }; const std::vector post_nms_count = { 6 }; const std::vector pre_nms_count = { 14, 1000 }; -template -const std::vector>> getInputTensors() { - std::vector>> input_tensors = { - { - "empty", - { - // 3 - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{3}, - std::vector{1.0f, 1.0f, 1.0f}), - // 36 x 4 = 144 - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{36, 4}, std::vector{ - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, - - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f}), - // 12 x 2 x 6 = 144float - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{12, 2, 6}, - std::vector{ - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}), - // {3 x 2 x 6} = 36 - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{3, 2, 6}, - std::vector{ - 5.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 4.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 8.0f, 1.0f}) - } - }, - { - "filled", - { - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{3}, - std::vector{150.0f, 150.0f, 1.0f}), - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{36, 4}, std::vector{ - 12.0f, 68.0f, 102.0f, 123.0f, 46.0f, 80.0f, 79.0f, 128.0f, 33.0f, 71.0f, 127.0f, 86.0f, 33.0f, - 56.0f, 150.0f, 73.0f, - 5.0f, 41.0f, 93.0f, 150.0f, 74.0f, 66.0f, 106.0f, 115.0f, 17.0f, 37.0f, 87.0f, 150.0f, 31.0f, - 27.0f, 150.0f, 39.0f, - 29.0f, 23.0f, 112.0f, 123.0f, 41.0f, 37.0f, 103.0f, 150.0f, 8.0f, 46.0f, 98.0f, 111.0f, 7.0f, - 69.0f, 114.0f, 150.0f, - 70.0f, 21.0f, 150.0f, 125.0f, 54.0f, 19.0f, 132.0f, 68.0f, 62.0f, 8.0f, 150.0f, 101.0f, 57.0f, - 81.0f, 150.0f, 97.0f, - 79.0f, 29.0f, 109.0f, 130.0f, 12.0f, 63.0f, 100.0f, 150.0f, 17.0f, 33.0f, 113.0f, 150.0f, 90.0f, - 78.0f, 150.0f, 111.0f, - 47.0f, 68.0f, 150.0f, 71.0f, 66.0f, 103.0f, 111.0f, 150.0f, 4.0f, 17.0f, 112.0f, 94.0f, 12.0f, - 8.0f, 119.0f, 98.0f, - 54.0f, 56.0f, 120.0f, 150.0f, 56.0f, 29.0f, 150.0f, 31.0f, 42.0f, 3.0f, 139.0f, 92.0f, 41.0f, - 65.0f, 150.0f, 130.0f, - 49.0f, 13.0f, 143.0f, 30.0f, 40.0f, 60.0f, 150.0f, 150.0f, 23.0f, 73.0f, 24.0f, 115.0f, 56.0f, - 84.0f, 107.0f, 108.0f, - 63.0f, 8.0f, 142.0f, 125.0f, 78.0f, 37.0f, 93.0f, 144.0f, 40.0f, 34.0f, 150.0f, 46.0f, 30.0f, - 21.0f, 150.0f, 120.0f}), - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{12, 2, 6}, - std::vector{ - 9.062256f, 10.883133f, 9.8441105f, 12.694285f, - 0.41781136f, 8.749107f, 14.990341f, 6.587644f, - 1.4206103f, - 13.299262f, 12.432549f, 2.736371f, 0.22732796f, - 6.3361835f, 12.268727f, 2.1009045f, 4.771589f, - 2.5131326f, - 5.610736f, 9.3604145f, 4.27379f, 8.317948f, - 0.60510135f, 6.7446275f, 1.0207708f, 1.1352817f, - 1.5785321f, - 1.718335f, 1.8093798f, 0.99247587f, 1.3233583f, - 1.7432803f, 1.8534478f, 1.2593061f, 1.7394226f, - 1.7686696f, - 1.647999f, 1.7611449f, 1.3119122f, 0.03007332f, - 1.1106564f, 0.55669737f, 0.2546148f, 1.9181818f, - 0.7134989f, - 2.0407224f, 1.7211134f, 1.8565536f, 14.562747f, - 2.8786168f, 0.5927796f, 0.2064463f, 7.6794515f, - 8.672126f, - 10.139171f, 8.002429f, 7.002932f, 12.6314945f, - 10.550842f, 0.15784842f, 0.3194304f, 10.752157f, - 3.709805f, - 11.628928f, 0.7136225f, 14.619964f, 15.177284f, - 2.2824087f, 15.381494f, 0.16618137f, 7.507227f, - 11.173228f, - 0.4923559f, 1.8227729f, 1.4749299f, 1.7833921f, - 1.2363617f, -0.23659119f, 1.5737582f, 1.779316f, - 1.9828427f, - 1.0482665f, 1.4900246f, 1.3563544f, 1.5341306f, - 0.7634312f, 4.6216766e-05f, 1.6161222f, 1.7512476f, - 1.9363779f, - 0.9195784f, 1.4906164f, -0.03244795f, 0.681073f, - 0.6192401f, 1.8033613f, 14.146055f, 3.4043705f, - 15.292292f, - 3.5295358f, 11.138999f, 9.952057f, 5.633434f, - 12.114562f, 9.427372f, 12.384038f, 9.583308f, - 8.427233f, - 15.293704f, 3.288159f, 11.64898f, 9.350885f, - 2.0037227f, 13.523184f, 4.4176426f, 6.1057625f, - 14.400079f, - 8.248259f, 11.815807f, 15.713364f, 1.0023532f, - 1.3203261f, 1.7100681f, 0.7407832f, 1.09448f, - 1.7188418f, - 1.4412547f, 1.4862992f, 0.74790007f, 0.31571656f, - 0.6398838f, 2.0236106f, 1.1869069f, 1.7265586f, - 1.2624544f, - 0.09934269f, 1.3508598f, 0.85212964f, -0.38968498f, - 1.7059708f, 1.6533034f, 1.7400402f, 1.8123854f, - -0.43063712f}), - ov::test::utils::create_tensor(ov::element::from(), ov::Shape{3, 2, 6}, - std::vector{ - 0.7719922f, 0.35906568f, 0.29054508f, 0.18124384f, - 0.5604661f, 0.84750974f, 0.98948747f, 0.009793862f, - 0.7184191f, - 0.5560748f, 0.6952493f, 0.6732593f, 0.3306898f, - 0.6790913f, 0.41128764f, 0.34593266f, 0.94296855f, - 0.7348507f, - 0.24478768f, 0.94024557f, 0.05405676f, 0.06466125f, - 0.36244348f, 0.07942984f, 0.10619422f, 0.09412837f, - 0.9053611f, - 0.22870538f, 0.9237487f, 0.20986171f, 0.5067282f, - 0.29709867f, 0.53138554f, 0.189101f, 0.4786443f, - 0.88421875f}), - } - } - }; - return input_tensors; -} - -const std::vector> input_shape = { +const std::vector input_shape = { // im_info / anchors / deltas / scores - static_shapes_to_test_representation({{3}, {36, 4}, {12, 2, 6}, {3, 2, 6}}), + ov::test::static_shapes_to_test_representation({{3}, {36, 4}, {12, 2, 6}, {3, 2, 6}}), }; INSTANTIATE_TEST_SUITE_P( smoke_ExperimentalDetectronGenerateProposalsSingleImageLayerTest_f16, ExperimentalDetectronGenerateProposalsSingleImageLayerTest, ::testing::Combine( - ::testing::ValuesIn(input_shape), + ::testing::Values(input_shape), ::testing::ValuesIn(min_size), ::testing::ValuesIn(nms_threshold), ::testing::ValuesIn(post_nms_count), ::testing::ValuesIn(pre_nms_count), - ::testing::ValuesIn(getInputTensors()), - ::testing::ValuesIn({ov::element::Type_t::f16}), + ::testing::Values(ov::element::f16), ::testing::Values(ov::test::utils::DEVICE_GPU)), ExperimentalDetectronGenerateProposalsSingleImageLayerTest::getTestCaseName); @@ -198,13 +35,12 @@ INSTANTIATE_TEST_SUITE_P( smoke_ExperimentalDetectronGenerateProposalsSingleImageLayerTest_f32, ExperimentalDetectronGenerateProposalsSingleImageLayerTest, ::testing::Combine( - ::testing::ValuesIn(input_shape), + ::testing::Values(input_shape), ::testing::ValuesIn(min_size), ::testing::ValuesIn(nms_threshold), ::testing::ValuesIn(post_nms_count), ::testing::ValuesIn(pre_nms_count), - ::testing::ValuesIn(getInputTensors()), - ::testing::ValuesIn({ov::element::Type_t::f32}), + ::testing::Values(ov::element::f32), ::testing::Values(ov::test::utils::DEVICE_GPU)), ExperimentalDetectronGenerateProposalsSingleImageLayerTest::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_roifeatureextractor.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_roifeatureextractor.cpp index 188e7c9bbddcb8..0fd8d81fd9f661 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_roifeatureextractor.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_roifeatureextractor.cpp @@ -2,13 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include "single_layer_tests/experimental_detectron_roifeatureextractor.hpp" - -using namespace ov::test; -using namespace ov::test::subgraph; +#include "single_op_tests/experimental_detectron_roifeatureextractor.hpp" namespace { +using ov::test::ExperimentalDetectronROIFeatureExtractorLayerTest; + const std::vector outputSize = {7, 14}; const std::vector samplingRatio = {1, 2, 3}; @@ -18,10 +16,10 @@ const std::vector> pyramidScales = { {2, 4, 8, 16} }; -const std::vector> staticInputShape = { - static_shapes_to_test_representation({{1000, 4}, {1, 8, 200, 336}, {1, 8, 100, 168}, {1, 8, 50, 84}, {1, 8, 25, 42}}), - static_shapes_to_test_representation({{1000, 4}, {1, 16, 200, 336}, {1, 16, 100, 168}, {1, 16, 50, 84}, {1, 16, 25, 42}}), - static_shapes_to_test_representation({{1200, 4}, {1, 8, 200, 42}, {1, 8, 100, 336}, {1, 8, 50, 168}, {1, 8, 25, 84}}) +const std::vector> staticInputShape = { + ov::test::static_shapes_to_test_representation({{1000, 4}, {1, 8, 200, 336}, {1, 8, 100, 168}, {1, 8, 50, 84}, {1, 8, 25, 42}}), + ov::test::static_shapes_to_test_representation({{1000, 4}, {1, 16, 200, 336}, {1, 16, 100, 168}, {1, 16, 50, 84}, {1, 16, 25, 42}}), + ov::test::static_shapes_to_test_representation({{1200, 4}, {1, 8, 200, 42}, {1, 8, 100, 336}, {1, 8, 50, 168}, {1, 8, 25, 84}}) }; INSTANTIATE_TEST_SUITE_P(smoke_ExperimentalROI_static, ExperimentalDetectronROIFeatureExtractorLayerTest, @@ -31,7 +29,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ExperimentalROI_static, ExperimentalDetectronROIF ::testing::ValuesIn(samplingRatio), ::testing::ValuesIn(pyramidScales), ::testing::Values(false), - ::testing::Values(ov::element::Type_t::f32), + ::testing::Values(ov::element::f32), ::testing::Values(ov::test::utils::DEVICE_GPU)), ExperimentalDetectronROIFeatureExtractorLayerTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_topk_rois.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_topk_rois.cpp index e08240d81c1a5f..f029c436ceaa50 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_topk_rois.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/experimental_detectron_topk_rois.cpp @@ -2,28 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include "single_layer_tests/experimental_detectron_topkrois.hpp" - -using namespace ov::test; -using namespace ov::test::subgraph; +#include "single_op_tests/experimental_detectron_topkrois.hpp" namespace { +using ov::test::ExperimentalDetectronTopKROIsLayerTest; + std::vector maxRois { 1000, 1500, 2000 }; -std::vector elementTypes { - ElementType::f16, - ElementType::f32 +std::vector elementTypes { + ov::element::f16, + ov::element::f32 }; -const std::vector> staticInputShape = { - static_shapes_to_test_representation({{3000, 4}, {3000}}), - static_shapes_to_test_representation({{4200, 4}, {4200}}), - static_shapes_to_test_representation({{4500, 4}, {4500}}) +const std::vector> staticInputShape = { + ov::test::static_shapes_to_test_representation({{3000, 4}, {3000}}), + ov::test::static_shapes_to_test_representation({{4200, 4}, {4200}}), + ov::test::static_shapes_to_test_representation({{4500, 4}, {4500}}) }; INSTANTIATE_TEST_SUITE_P(smoke_ExperimentalDetectronTopKROIs_static, ExperimentalDetectronTopKROIsLayerTest, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index b40264d2fa1eab..67ee635cacd8cb 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -2,25 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include "single_layer_tests/gru_sequence.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace LayerTestsDefinitions; +#include "single_op_tests/gru_sequence.hpp" namespace { - std::vector mode{ngraph::helpers::SequenceTestsMode::CONVERT_TO_TI_MAX_SEQ_LEN_CONST, - ngraph::helpers::SequenceTestsMode::CONVERT_TO_TI_RAND_SEQ_LEN_CONST, - ngraph::helpers::SequenceTestsMode::CONVERT_TO_TI_RAND_SEQ_LEN_PARAM, - ngraph::helpers::SequenceTestsMode::PURE_SEQ_RAND_SEQ_LEN_CONST, - ngraph::helpers::SequenceTestsMode::PURE_SEQ_RAND_SEQ_LEN_PARAM, - ngraph::helpers::SequenceTestsMode::PURE_SEQ}; + using ov::test::GRUSequenceTest; + + std::vector mode{ov::test::utils::SequenceTestsMode::CONVERT_TO_TI_MAX_SEQ_LEN_CONST, + ov::test::utils::SequenceTestsMode::CONVERT_TO_TI_RAND_SEQ_LEN_CONST, + ov::test::utils::SequenceTestsMode::CONVERT_TO_TI_RAND_SEQ_LEN_PARAM, + ov::test::utils::SequenceTestsMode::PURE_SEQ_RAND_SEQ_LEN_CONST, + ov::test::utils::SequenceTestsMode::PURE_SEQ_RAND_SEQ_LEN_PARAM, + ov::test::utils::SequenceTestsMode::PURE_SEQ}; // output values increase rapidly without clip, so use only seq_lengths = 2 - std::vector seq_lengths_zero_clip{2}; - std::vector seq_lengths_clip_non_zero{20}; - std::vector batch{10}; - std::vector hidden_size{1, 10}; + std::vector seq_lengths_zero_clip{2}; + std::vector seq_lengths_clip_non_zero{20}; // std::vector input_size{10}; std::vector> activations = {{"relu", "tanh"}, {"tanh", "sigmoid"}, {"sigmoid", "tanh"}, {"tanh", "relu"}}; @@ -28,40 +23,36 @@ namespace { std::vector clip{0.f}; std::vector clip_non_zeros{0.7f}; std::vector direction = {ov::op::RecurrentSequenceDirection::FORWARD, - ov::op::RecurrentSequenceDirection::REVERSE, - ov::op::RecurrentSequenceDirection::BIDIRECTIONAL + ov::op::RecurrentSequenceDirection::REVERSE, + ov::op::RecurrentSequenceDirection::BIDIRECTIONAL }; - std::vector netPrecisions = {InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16}; + std::vector netPrecisions = {ov::element::f32, + ov::element::f16}; INSTANTIATE_TEST_SUITE_P(GRUSequenceCommonZeroClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), - ::testing::ValuesIn(seq_lengths_zero_clip), - ::testing::ValuesIn(batch), - ::testing::ValuesIn(hidden_size), + ::testing::Values(seq_lengths_zero_clip), // ::testing::ValuesIn(input_size), // hardcoded to 10 due to Combine supports up to 10 args ::testing::ValuesIn(activations), ::testing::ValuesIn(clip), ::testing::ValuesIn(linear_before_reset), ::testing::ValuesIn(direction), - ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), + ::testing::Values(ov::test::utils::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), ::testing::Values(ov::test::utils::DEVICE_GPU)), GRUSequenceTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(GRUSequenceCommonZeroClipNonConstantWRB, GRUSequenceTest, ::testing::Combine( - ::testing::Values(ngraph::helpers::SequenceTestsMode::PURE_SEQ), - ::testing::ValuesIn(seq_lengths_zero_clip), - ::testing::ValuesIn(batch), - ::testing::ValuesIn(hidden_size), + ::testing::Values(ov::test::utils::SequenceTestsMode::PURE_SEQ), + ::testing::Values(seq_lengths_zero_clip), // ::testing::ValuesIn(input_size), // hardcoded to 10 due to Combine supports up to 10 args ::testing::ValuesIn(activations), ::testing::ValuesIn(clip), ::testing::ValuesIn(linear_before_reset), ::testing::ValuesIn(direction), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(ov::test::utils::InputLayerType::PARAMETER), ::testing::ValuesIn(netPrecisions), ::testing::Values(ov::test::utils::DEVICE_GPU)), GRUSequenceTest::getTestCaseName); @@ -69,15 +60,13 @@ namespace { INSTANTIATE_TEST_SUITE_P(GRUSequenceCommonClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), - ::testing::ValuesIn(seq_lengths_clip_non_zero), - ::testing::ValuesIn(batch), - ::testing::ValuesIn(hidden_size), + ::testing::Values(seq_lengths_clip_non_zero), // ::testing::ValuesIn(input_size), // hardcoded to 10 due to Combine supports up to 10 args ::testing::ValuesIn(activations), ::testing::ValuesIn(clip_non_zeros), ::testing::ValuesIn(linear_before_reset), ::testing::ValuesIn(direction), - ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), + ::testing::Values(ov::test::utils::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), ::testing::Values(ov::test::utils::DEVICE_GPU)), GRUSequenceTest::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp index 2bb3abc7e38ff1..e6cb885725cb9d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -2,128 +2,100 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - -#include "single_layer_tests/interpolate.hpp" +#include "single_op_tests/interpolate.hpp" #include "common_test_utils/test_constants.hpp" -using namespace LayerTestsDefinitions; +namespace { +using ov::test::InterpolateLayerTest; +using ov::test::Interpolate11LayerTest; class GPUInterpolateLayerTest : public InterpolateLayerTest { protected: void SetUp() override { InterpolateLayerTest::SetUp(); - InterpolateLayerTestParams params = GetParam(); - InferenceEngine::Precision netPrecision; - std::string targetDevice; - std::tie(std::ignore, netPrecision, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore, - std::ignore, targetDevice, std::ignore) = params; - // Some rounding float to integer types on GPU may differ from CPU, and as result, - // the actual values may differ from reference ones on 1 when the float is very close to an integer, - // e.g 6,0000023 calculated on CPU may be cast to 5 by OpenCL convert_uchar function. - // That is why the threshold is set 1.f for integer types. - if (targetDevice == "GPU" && - (netPrecision == InferenceEngine::Precision::U8 || netPrecision == InferenceEngine::Precision::I8)) { - threshold = 1.f; - } - } -}; - -namespace v11 { - -class GPUInterpolateLayerTest : public LayerTestsDefinitions::v11::InterpolateLayerTest { -protected: - void SetUp() override { - LayerTestsDefinitions::v11::InterpolateLayerTest::SetUp(); - InterpolateLayerTestParams params = GetParam(); - InferenceEngine::Precision netPrecision; - std::string targetDevice; - std::tie(std::ignore, netPrecision, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore, - std::ignore, targetDevice, std::ignore) = params; + ov::test::InterpolateLayerTestParams params = GetParam(); + ov::test::InterpolateSpecificParams interpolate_params; + ov::element::Type model_type; + std::vector shapes; + ov::Shape target_shape; + std::map additional_config; + std::tie(interpolate_params, model_type, shapes, target_shape, targetDevice, additional_config) = this->GetParam(); // Some rounding float to integer types on GPU may differ from CPU, and as result, // the actual values may differ from reference ones on 1 when the float is very close to an integer, // e.g 6,0000023 calculated on CPU may be cast to 5 by OpenCL convert_uchar function. // That is why the threshold is set 1.f for integer types. if (targetDevice == "GPU" && - (netPrecision == InferenceEngine::Precision::U8 || netPrecision == InferenceEngine::Precision::I8)) { - threshold = 1.f; + (model_type == ov::element::u8 || model_type == ov::element::i8)) { + rel_threshold = 1.f; } } }; -} // namespace v11 - -TEST_P(GPUInterpolateLayerTest, CompareWithRefs) { - Run(); -} - -namespace { - -const std::vector netPrecisions = { - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, +const std::vector netPrecisions = { + ov::element::f16, + ov::element::f32, }; -const std::vector netOnnx5dPrecisions = { - InferenceEngine::Precision::I8, - InferenceEngine::Precision::U8, - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, +const std::vector netOnnx5dPrecisions = { + ov::element::i8, + ov::element::u8, + ov::element::f16, + ov::element::f32, }; -const std::vector> inShapes = { +const std::vector inShapes = { {1, 1, 23, 23}, }; -const std::vector> targetShapes = { +const std::vector targetShapes = { {1, 1, 46, 46}, }; -const std::vector> in5dShapes = { +const std::vector in5dShapes = { {1, 1, 2, 2, 2}, }; -const std::vector> target5dShapes = { +const std::vector target5dShapes = { {1, 1, 4, 4, 4}, }; -const std::vector modesWithoutNearest = { - ov::op::v4::Interpolate::InterpolateMode::LINEAR, - ov::op::v4::Interpolate::InterpolateMode::CUBIC, - ov::op::v4::Interpolate::InterpolateMode::LINEAR_ONNX, +const std::vector modesWithoutNearest = { + ov::op::util::InterpolateBase::InterpolateMode::LINEAR, + ov::op::util::InterpolateBase::InterpolateMode::CUBIC, + ov::op::util::InterpolateBase::InterpolateMode::LINEAR_ONNX, }; -const std::vector nearestMode = { - ov::op::v4::Interpolate::InterpolateMode::NEAREST, +const std::vector nearestMode = { + ov::op::util::InterpolateBase::InterpolateMode::NEAREST, }; -const std::vector linearOnnxMode = { - ov::op::v4::Interpolate::InterpolateMode::LINEAR_ONNX, +const std::vector linearOnnxMode = { + ov::op::util::InterpolateBase::InterpolateMode::LINEAR_ONNX, }; -const std::vector coordinateTransformModes = { - ov::op::v4::Interpolate::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN, - ov::op::v4::Interpolate::CoordinateTransformMode::PYTORCH_HALF_PIXEL, - ov::op::v4::Interpolate::CoordinateTransformMode::HALF_PIXEL, - ov::op::v4::Interpolate::CoordinateTransformMode::ASYMMETRIC, - ov::op::v4::Interpolate::CoordinateTransformMode::ALIGN_CORNERS, +const std::vector coordinateTransformModes = { + ov::op::util::InterpolateBase::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN, + ov::op::util::InterpolateBase::CoordinateTransformMode::PYTORCH_HALF_PIXEL, + ov::op::util::InterpolateBase::CoordinateTransformMode::HALF_PIXEL, + ov::op::util::InterpolateBase::CoordinateTransformMode::ASYMMETRIC, + ov::op::util::InterpolateBase::CoordinateTransformMode::ALIGN_CORNERS, }; -const std::vector shapeCalculationMode = { - ov::op::v4::Interpolate::ShapeCalcMode::SIZES, - ov::op::v4::Interpolate::ShapeCalcMode::SCALES, +const std::vector shapeCalculationMode = { + ov::op::util::InterpolateBase::ShapeCalcMode::SIZES, + ov::op::util::InterpolateBase::ShapeCalcMode::SCALES, }; -const std::vector nearestModes = { - ov::op::v4::Interpolate::NearestMode::SIMPLE, - ov::op::v4::Interpolate::NearestMode::ROUND_PREFER_FLOOR, - ov::op::v4::Interpolate::NearestMode::FLOOR, - ov::op::v4::Interpolate::NearestMode::CEIL, - ov::op::v4::Interpolate::NearestMode::ROUND_PREFER_CEIL, +const std::vector nearestModes = { + ov::op::util::InterpolateBase::NearestMode::SIMPLE, + ov::op::util::InterpolateBase::NearestMode::ROUND_PREFER_FLOOR, + ov::op::util::InterpolateBase::NearestMode::FLOOR, + ov::op::util::InterpolateBase::NearestMode::CEIL, + ov::op::util::InterpolateBase::NearestMode::ROUND_PREFER_CEIL, }; -const std::vector defaultNearestMode = { - ov::op::v4::Interpolate::NearestMode::ROUND_PREFER_FLOOR, +const std::vector defaultNearestMode = { + ov::op::util::InterpolateBase::NearestMode::ROUND_PREFER_FLOOR, }; const std::vector> pads = { @@ -233,11 +205,7 @@ const auto interpolate5dCasesNearestMode = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearest, ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(inShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(inShapes)), ::testing::ValuesIn(targetShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), @@ -246,11 +214,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testin INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_BasicEmptyAxes, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearestEmptyAxes, ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(inShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(inShapes)), ::testing::ValuesIn(targetShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), @@ -259,11 +223,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_BasicEmptyAxes, InterpolateLayerTest, INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearesMode, ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(inShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(inShapes)), ::testing::ValuesIn(targetShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), @@ -272,11 +232,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::test INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_5dLinearOnnx, GPUInterpolateLayerTest, ::testing::Combine( interpolate5dCasesLinearOnnxMode, ::testing::ValuesIn(netOnnx5dPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(in5dShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(in5dShapes)), ::testing::ValuesIn(target5dShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), @@ -285,11 +241,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_5dLinearOnnx, GPUInterpolateLayerTest INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_5dNearest, GPUInterpolateLayerTest, ::testing::Combine( interpolate5dCasesNearestMode, ::testing::ValuesIn(netOnnx5dPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(in5dShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(in5dShapes)), ::testing::ValuesIn(target5dShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), @@ -298,32 +250,28 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_5dNearest, GPUInterpolateLayerTest, : INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Basic, Interpolate11LayerTest, ::testing::Combine( interpolateCasesWithoutNearest, ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(inShapes), + ::testing::Values(ov::test::static_shapes_to_test_representation(inShapes)), ::testing::ValuesIn(targetShapes), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), Interpolate11LayerTest::getTestCaseName); -const std::vector modesPillow = { - ov::op::v4::Interpolate::InterpolateMode::BILINEAR_PILLOW, - ov::op::v4::Interpolate::InterpolateMode::BICUBIC_PILLOW, +const std::vector modesPillow = { + ov::op::util::InterpolateBase::InterpolateMode::BILINEAR_PILLOW, + ov::op::util::InterpolateBase::InterpolateMode::BICUBIC_PILLOW, }; -const std::vector pillowModePrecisions = { - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, +const std::vector pillowModePrecisions = { + ov::element::f16, + ov::element::f32, }; INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow, Interpolate11LayerTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(modesPillow), - ::testing::Values(ov::op::v4::Interpolate::ShapeCalcMode::SCALES), - ::testing::Values(ov::op::v4::Interpolate::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), - ::testing::Values(ov::op::v4::Interpolate::NearestMode::SIMPLE), + ::testing::Values(ov::op::util::InterpolateBase::ShapeCalcMode::SCALES), + ::testing::Values(ov::op::util::InterpolateBase::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), + ::testing::Values(ov::op::util::InterpolateBase::NearestMode::SIMPLE), ::testing::Values(false), ::testing::Values(std::vector{0, 0, 1, 1}), ::testing::Values(std::vector{0, 0, 1, 1}), @@ -331,12 +279,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow, Interpolate11LayerTest, :: ::testing::Values(std::vector{2, 3}), ::testing::Values(std::vector{2.f, 2.f})), ::testing::ValuesIn(pillowModePrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector{1, 1, 23, 23}), - ::testing::Values(std::vector{1, 1, 50, 50}), + ::testing::Values(ov::test::static_shapes_to_test_representation(std::vector{{1, 1, 23, 23}})), + ::testing::Values(ov::Shape{1, 1, 50, 50}), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), Interpolate11LayerTest::getTestCaseName); @@ -345,22 +289,18 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow, Interpolate11LayerTest, :: INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow_Horizontal, Interpolate11LayerTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(modesPillow), - ::testing::Values(ov::op::v4::Interpolate::ShapeCalcMode::SCALES), - ::testing::Values(ov::op::v4::Interpolate::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), - ::testing::Values(ov::op::v4::Interpolate::NearestMode::SIMPLE), + ::testing::Values(ov::op::util::InterpolateBase::ShapeCalcMode::SCALES), + ::testing::Values(ov::op::util::InterpolateBase::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), + ::testing::Values(ov::op::util::InterpolateBase::NearestMode::SIMPLE), ::testing::Values(false), ::testing::Values(std::vector{0, 0, 1, 1}), ::testing::Values(std::vector{0, 0, 1, 1}), ::testing::ValuesIn(cubeCoefs), ::testing::Values(std::vector{2, 3}), ::testing::Values(std::vector{1.f, 2.f})), - ::testing::Values(InferenceEngine::Precision::FP32), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector{1, 1, 23, 23}), - ::testing::Values(std::vector{1, 1, 25, 50}), + ::testing::Values(ov::element::f32), + ::testing::Values(ov::test::static_shapes_to_test_representation(std::vector{{1, 1, 23, 23}})), + ::testing::Values(ov::Shape{1, 1, 25, 50}), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), Interpolate11LayerTest::getTestCaseName); @@ -369,22 +309,18 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow_Horizontal, Interpolate11La INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow_Vertical, Interpolate11LayerTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(modesPillow), - ::testing::Values(ov::op::v4::Interpolate::ShapeCalcMode::SCALES), - ::testing::Values(ov::op::v4::Interpolate::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), - ::testing::Values(ov::op::v4::Interpolate::NearestMode::SIMPLE), + ::testing::Values(ov::op::util::InterpolateBase::ShapeCalcMode::SCALES), + ::testing::Values(ov::op::util::InterpolateBase::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), + ::testing::Values(ov::op::util::InterpolateBase::NearestMode::SIMPLE), ::testing::Values(false), ::testing::Values(std::vector{0, 0, 1, 1}), ::testing::Values(std::vector{0, 0, 1, 1}), ::testing::ValuesIn(cubeCoefs), ::testing::Values(std::vector{2, 3}), ::testing::Values(std::vector{2.f, 1.f})), - ::testing::Values(InferenceEngine::Precision::FP32), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector{1, 1, 23, 23}), - ::testing::Values(std::vector{1, 1, 50, 25}), + ::testing::Values(ov::element::f32), + ::testing::Values(ov::test::static_shapes_to_test_representation(std::vector{{1, 1, 23, 23}})), + ::testing::Values(ov::Shape{1, 1, 50, 25}), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), Interpolate11LayerTest::getTestCaseName); @@ -393,22 +329,18 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow_Vertical, Interpolate11Laye INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_11_Pillow_Vertical_BF, Interpolate11LayerTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(modesPillow), - ::testing::Values(ov::op::v4::Interpolate::ShapeCalcMode::SCALES), - ::testing::Values(ov::op::v4::Interpolate::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), - ::testing::Values(ov::op::v4::Interpolate::NearestMode::SIMPLE), + ::testing::Values(ov::op::util::InterpolateBase::ShapeCalcMode::SCALES), + ::testing::Values(ov::op::util::InterpolateBase::CoordinateTransformMode::TF_HALF_PIXEL_FOR_NN), + ::testing::Values(ov::op::util::InterpolateBase::NearestMode::SIMPLE), ::testing::Values(false), ::testing::Values(std::vector{2, 1, 0, 0}), ::testing::Values(std::vector{2, 1, 0, 0}), ::testing::ValuesIn(cubeCoefs), ::testing::Values(std::vector{0, 1}), ::testing::Values(std::vector{2.f, 1.f})), - ::testing::Values(InferenceEngine::Precision::FP32), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector{23, 23, 2, 2}), - ::testing::Values(std::vector{52, 26, 2, 2}), + ::testing::Values(ov::element::f32), + ::testing::Values(ov::test::static_shapes_to_test_representation(std::vector{{23, 23, 2, 2}})), + ::testing::Values(ov::Shape{52, 26, 2, 2}), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::Values(additional_config)), Interpolate11LayerTest::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/memory.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/memory.cpp index ea1028e4ff8a6c..772e03ef3dd0ab 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/memory.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/memory.cpp @@ -2,44 +2,41 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - -#include "single_layer_tests/memory.h" - -using namespace LayerTestsDefinitions; +#include "single_op_tests/memory.h" namespace { +using ov::test::MemoryLayerTest; +using ov::test::MemoryV3LayerTest; -const std::vector inShapes = { +const std::vector inShapes = { {1}, {3}, {3, 3, 3}, {2, 3, 4, 5}, }; -const std::vector inputPrecisions = { - InferenceEngine::Precision::I32, - InferenceEngine::Precision::FP32, +const std::vector inputPrecisions = { + ov::element::i32, + ov::element::f32, }; const std::vector iterationCount {1, 3, 10}; -INSTANTIATE_TEST_SUITE_P(smoke_MemoryTest, MemoryTest, +INSTANTIATE_TEST_SUITE_P(smoke_MemoryTest, MemoryLayerTest, ::testing::Combine( - ::testing::Values(ngraph::helpers::MemoryTransformation::NONE), + ::testing::Values(ov::test::utils::MemoryTransformation::NONE), ::testing::ValuesIn(iterationCount), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(inputPrecisions), ::testing::Values(ov::test::utils::DEVICE_GPU)), - MemoryTest::getTestCaseName); + MemoryLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_MemoryTestV3, MemoryTestV3, +INSTANTIATE_TEST_SUITE_P(smoke_MemoryTestV3, MemoryV3LayerTest, ::testing::Combine( - ::testing::Values(ngraph::helpers::MemoryTransformation::NONE), + ::testing::Values(ov::test::utils::MemoryTransformation::NONE), ::testing::ValuesIn(iterationCount), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(inputPrecisions), ::testing::Values(ov::test::utils::DEVICE_GPU)), - MemoryTest::getTestCaseName); - + MemoryLayerTest::getTestCaseName); } // namespace