diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/synthetic.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/synthetic.cpp index 144ad535f..3f0ea0dda 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/synthetic.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/synthetic.cpp @@ -6,8 +6,8 @@ #include #include "behavior/plugin/hetero_synthetic.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/subgraph_builders.hpp" +#include "ov_models/builders.hpp" +#include "ov_models/subgraph_builders.hpp" namespace { using namespace HeteroTests; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 2b461e6d1..e57a0b778 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -12,7 +12,7 @@ #include "cuda_test_constants.hpp" #include "finite_comparer.hpp" -#include "ngraph_functions/builders.hpp" +#include "ov_models/builders.hpp" using namespace LayerTestsDefinitions; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp index 2295fa386..9d5ece80c 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp @@ -10,7 +10,7 @@ #include "cuda_test_constants.hpp" #include "finite_comparer.hpp" -#include "ngraph_functions/builders.hpp" +#include "ov_models/builders.hpp" #include "shared_test_classes/single_layer/convolution_backprop_data.hpp" using namespace LayerTestsDefinitions; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp index 60c02883a..0cd408b9d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp index c5bf77205..83a92fac4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp index 78e62867c..d0e4053fa 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp index b5ec013f4..056ef9f4a 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp index 05d60ee7c..6f42aa567 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp @@ -12,7 +12,7 @@ #include "cuda_test_constants.hpp" #include "finite_comparer.hpp" -#include "ngraph_functions/builders.hpp" +#include "ov_models/builders.hpp" using namespace LayerTestsDefinitions; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp index 70e1228c1..1c36358e9 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp index 3a8b0258b..7de9bb694 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/range.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/range.cpp index f4cb18c09..aee55e896 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/range.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/range.cpp @@ -16,7 +16,7 @@ #include #include "kernels/details/cuda_type_traits.hpp" -#include "ngraph_functions/builders.hpp" +#include "ov_models/builders.hpp" namespace { diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp index c7f801e6d..3fe94dc13 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp @@ -2,42 +2,43 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/transpose.hpp" - -#include #include #include "common_test_utils/test_constants.hpp" +#include "cuda_test_constants.hpp" +#include "single_op_tests/transpose.hpp" -using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, +using namespace ov::test; +using namespace ov::test::utils; +using ov::test::TransposeLayerTest; + +const std::vector model_types = { + ov::element::f16, + ov::element::f32, }; -const std::vector> inputShapes = { - std::vector{256, 3, 100, 100}, - std::vector{1, 2048, 1, 1}, +const std::vector> input_shapes = { + {{256, 3, 100, 100}}, + {{1, 2048, 1, 1}}, }; -const std::vector> inputOrder = { +const std::vector> input_order = { std::vector{0, 3, 2, 1}, // Empty inputs are currently unsupported in nvidia_gpu. // std::vector{}, }; -const auto params = testing::Combine(testing::ValuesIn(inputOrder), - 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(inputShapes), - testing::Values(ov::test::utils::DEVICE_NVIDIA)); +const auto params = testing::Combine(testing::ValuesIn(input_order), + testing::ValuesIn(model_types), + testing::ValuesIn(static_shapes_to_test_representation(input_shapes)), + testing::Values(DEVICE_NVIDIA)); -INSTANTIATE_TEST_CASE_P(smoke_Transpose, TransposeLayerTest, params, TransposeLayerTest::getTestCaseName); +INSTANTIATE_TEST_CASE_P(smoke_Transpose, + TransposeLayerTest, + params, + TransposeLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp index ab3235398..007f41f0a 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp @@ -2,24 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "single_layer_tests/variadic_split.hpp" - #include #include "common_test_utils/test_constants.hpp" #include "cuda_test_constants.hpp" - -using namespace LayerTestsDefinitions; +#include "single_op_tests/variadic_split.hpp" namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, +using namespace ov::test; +using namespace ov::test::utils; +using ov::test::VariadicSplitLayerTest; + +const std::vector model_types = { + ov::element::f32, + ov::element::f16 }; // Sum of elements numSplits = inputShapes[Axis] -const std::vector> smoke_numSplits = { +const std::vector> num_splits = { {1, 16, 5, 8}, {2, 19, 5, 4}, {7, 13, 2, 8}, @@ -27,201 +28,122 @@ const std::vector> smoke_numSplits = { {4, 11, 6, 9}, }; -const std::vector smoke_axis = {-3, -2, -1, 0, 1, 2, 3}; - -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, - VariadicSplitLayerTest, - ::testing::Combine(::testing::ValuesIn(smoke_numSplits), - ::testing::ValuesIn(smoke_axis), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - VariadicSplitLayerTest::getTestCaseName); - -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_U32, - VariadicSplitLayerTest, - ::testing::Combine(::testing::ValuesIn(smoke_numSplits), - ::testing::ValuesIn(smoke_axis), - ::testing::Values(InferenceEngine::Precision::U32), - ::testing::Values(InferenceEngine::Precision::U32), - ::testing::Values(InferenceEngine::Precision::U32), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - VariadicSplitLayerTest::getTestCaseName); +const std::vector axis = {-3, -2, -1, 0, 1, 2, 3}; -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_I64, +INSTANTIATE_TEST_CASE_P(num_splitsCheck, VariadicSplitLayerTest, - ::testing::Combine(::testing::ValuesIn(smoke_numSplits), - ::testing::ValuesIn(smoke_axis), - ::testing::Values(InferenceEngine::Precision::I64), - ::testing::Values(InferenceEngine::Precision::I64), - ::testing::Values(InferenceEngine::Precision::I64), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::Combine(::testing::ValuesIn(num_splits), + ::testing::ValuesIn(axis), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{30, 30, 30, 30}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis1, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{1, 1, 1}), ::testing::Values(1), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 40, 40, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 40, 40, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis2, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{10, 20, 10}), ::testing::Values(2), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 40, 40, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 40, 40, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis3, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{5, 5, 30}), ::testing::Values(3), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 40, 40, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 40, 40, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis4, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{20, 60, 5}), ::testing::Values(4), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 40, 40, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 40, 40, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis1, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{1, 1, 1}), ::testing::Values(1), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 20, 20, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 20, 20, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis2, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{5, 12, 3}), ::testing::Values(2), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 20, 20, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 20, 20, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis3, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{2, 8, 10}), ::testing::Values(3), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 20, 20, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 20, 20, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis4, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{65, 3, 17}), ::testing::Values(4), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 20, 20, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 20, 20, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis1, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{1, 1, 1}), ::testing::Values(1), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 80, 80, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 80, 80, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis2, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{13, 13, 54}), ::testing::Values(2), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 80, 80, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 80, 80, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis3, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{7, 3, 70}), ::testing::Values(3), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 80, 80, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 80, 80, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis4, VariadicSplitLayerTest, ::testing::Combine(::testing::Values(std::vector{1, 1, 83}), ::testing::Values(4), - ::testing::ValuesIn(netPrecisions), - ::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, 3, 80, 80, 85}), - ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(model_types), + ::testing::Values(static_shapes_to_test_representation({{1, 3, 80, 80, 85}})), + ::testing::Values(DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); - } // namespace diff --git a/modules/nvidia_plugin/tests/unit/CMakeLists.txt b/modules/nvidia_plugin/tests/unit/CMakeLists.txt index e7f13b956..7d06bf257 100644 --- a/modules/nvidia_plugin/tests/unit/CMakeLists.txt +++ b/modules/nvidia_plugin/tests/unit/CMakeLists.txt @@ -35,7 +35,7 @@ ov_add_test_target( openvino::gtest openvino::gtest_main openvino::gmock - openvino::ngraphFunctions + openvino::ov_models openvino::commonTestUtils ADD_CPPLINT ADD_CLANG_FORMAT diff --git a/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp b/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp index f4e4a0cf7..0ac6151f1 100644 --- a/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp +++ b/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp @@ -6,8 +6,8 @@ #include "cuda_graph_topology_runner.hpp" #include "cuda_simple_execution_delegator.hpp" -#include "ngraph_functions/builders.hpp" -#include "ngraph_functions/utils/data_utils.hpp" +#include "ov_models/builders.hpp" +#include "ov_models/utils/data_utils.hpp" #include "ops/parameter.hpp" #include "ops/result.hpp"