Merge branch 'master' into tokenizer-fix-decode

apaniukov · Oct 6, 2023 · 372465b · 372465b
2 parents 45c0068 + d2944fd
commit 372465b
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 167 deletions.
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
@@ -6,8 +6,8 @@
 #include <vector>
 
 #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/.../tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/.../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/...ts/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/...ts/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/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp b/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp
@@ -13,7 +13,7 @@
 #include <functional_test_utils/skip_tests_config.hpp>
 #include <ie_precision.hpp>
 #include <limits>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <openvino/op/util/attr_types.hpp>
 #include <tuple>
 #include <vector>

diff --git a/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/...s/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp
@@ -17,8 +17,8 @@
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/shape.hpp>
 #include <ngraph/type/element_type.hpp>
-#include <ngraph_functions/builders.hpp>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/builders.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <openvino/op/util/attr_types.hpp>
 #include <shared_test_classes/base/layer_test_utils.hpp>
 #include <shared_test_classes/single_layer/activation.hpp>

diff --git a/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp b/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp
@@ -20,8 +20,8 @@
 #include <ngraph/op/parameter.hpp>
 #include <ngraph/type/bfloat16.hpp>
 #include <ngraph/type/float16.hpp>
-#include <ngraph_functions/builders.hpp>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/builders.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <sstream>
 #include <vector>
 

diff --git a/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp b/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp
@@ -9,7 +9,7 @@
 #include <cuda_test_constants.hpp>
 #include <ie_precision.hpp>
 #include <map>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <string>
 #include <vector>
 

diff --git a/.../functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/.../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/...tional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp b/...tional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp
@@ -9,7 +9,7 @@
 #include <cuda_test_constants.hpp>
 #include <functional_test_utils/skip_tests_config.hpp>
 #include <ie_precision.hpp>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <openvino/op/util/attr_types.hpp>
 #include <tuple>
 #include <vector>

diff --git a/...tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp b/...tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 #include <cuda_test_constants.hpp>
-#include <ngraph_functions/utils/ngraph_helpers.hpp>
+#include <ov_models/utils/ov_helpers.hpp>
 #include <openvino/op/util/attr_types.hpp>
 #include <vector>
 

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
@@ -16,7 +16,7 @@
 #include <ops/parameter.hpp>
 
 #include "kernels/details/cuda_type_traits.hpp"
-#include "ngraph_functions/builders.hpp"
+#include "ov_models/builders.hpp"
 
 namespace {
 

diff --git a/...idia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp b/...idia_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 <cuda_test_constants.hpp>
 #include <vector>
 
 #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<InferenceEngine::Precision> netPrecisions = {
-    InferenceEngine::Precision::FP16,
-    InferenceEngine::Precision::FP32,
+using namespace ov::test;
+using namespace ov::test::utils;
+using ov::test::TransposeLayerTest;
+
+const std::vector<ov::element::Type> model_types = {
+    ov::element::f16,
+    ov::element::f32,
 };
 
-const std::vector<std::vector<size_t>> inputShapes = {
-    std::vector<size_t>{256, 3, 100, 100},
-    std::vector<size_t>{1, 2048, 1, 1},
+const std::vector<std::vector<ov::Shape>> input_shapes = {
+    {{256, 3, 100, 100}},
+    {{1, 2048, 1, 1}},
 };
 
-const std::vector<std::vector<size_t>> inputOrder = {
+const std::vector<std::vector<size_t>> input_order = {
     std::vector<size_t>{0, 3, 2, 1},
     // Empty inputs are currently unsupported in nvidia_gpu.
     //        std::vector<size_t>{},
 };
 
-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