Fixes

openvinotoolkit · Nov 13, 2023 · b2e708f · b2e708f
1 parent f52eab0
commit b2e708f
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 110 deletions.
diff --git a/...s/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp b/...s/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp
@@ -71,18 +71,18 @@ class CUDAActivationIntegerLayerTest : public ActivationLayerTest {
 
 // List of operations that should be tested also with integer precision
 const std::map<ActivationTypes, std::vector<std::vector<float>>> intActivationTypes = {
-    {Abs, {}},
-    {Negative, {}},
-    {Cos, {}},
-    {Cosh, {}},
-    {Sinh, {}},
-    {Sqrt, {}},
-    {Log, {}},
+    {ActivationTypes::Abs, {}},
+    {ActivationTypes::Negative, {}},
+    {ActivationTypes::Cos, {}},
+    {ActivationTypes::Cosh, {}},
+    {ActivationTypes::Sinh, {}},
+    {ActivationTypes::Sqrt, {}},
+    {ActivationTypes::Log, {}},
 };
 
 const std::map<ActivationTypes, std::vector<std::vector<float>>> preluActivationParamTypes = {
-    {PReLu, {{}}},  // Slope will be filled with increasing values from -10 to match slope input shape
-    {LeakyRelu, {{0.01f}}}};
+    {ActivationTypes::PReLu, {{}}},  // Slope will be filled with increasing values from -10 to match slope input shape
+    {ActivationTypes::LeakyRelu, {{0.01f}}}};
 
 std::map<std::vector<size_t>, std::vector<std::vector<size_t>>> basic = {
     {{1, 50}, {{}}},

diff --git a/...idia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp b/...idia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp
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
@@ -21,7 +21,7 @@
 #include "average_finder.hpp"
 
 namespace LayerTestsDefinitions {
-usign ov::test::utils::ActivationTypes;
+using ov::test::utils::ActivationTypes;
 
 constexpr uint32_t RANGE = 10;
 constexpr int32_t START_FROM = -5;

diff --git a/..._plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py b/..._plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py
@@ -49,7 +49,7 @@ def cpp_params_name(self):
 
     @property
     def cpp_params_decl(self):
-        return 'const {type} {name} = \n\t{{{{Clamp, {{{min}, {max}}}}}, {{{shape}, {{}}}}}};'.format(
+        return 'const {type} {name} = \n\t{{{{ActivationTypes::Clamp, {{{min}, {max}}}}}, {{{shape}, {{}}}}}};'.format(
             type = self.test_traits.cpp_alias_name,
             name = self.cpp_params_name,
             min = self.op.data['min'].as_float(),

diff --git a/...sts/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 b/...sts/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2
@@ -4,7 +4,7 @@ INSTANTIATE_TEST_CASE_P(
     {{op.cpp_test_name}},
     {{op.cpp_test_class_name}},
     ::testing::Combine(
-        ::testing::Values(std::pair<ActivationTypes, float>{Sigmoid, 0}),
+        ::testing::Values(std::pair<ActivationTypes, float>{ActivationTypes::Sigmoid, 0}),
         ::testing::ValuesIn(std::vector<InferenceEngine::Precision>({{op.cpp_net_precisions}})),
         ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
         ::testing::Values(InferenceEngine::Precision::UNSPECIFIED),

diff --git a/...tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 b/...tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2
@@ -4,7 +4,7 @@ INSTANTIATE_TEST_CASE_P(
     {{op.cpp_test_name}},
     {{op.cpp_test_class_name}},
     ::testing::Combine(
-        ::testing::Values(std::pair<ActivationTypes, float>{Swish, {1.0}}),
+        ::testing::Values(std::pair<ActivationTypes, float>{ActivationTypes::Swish, {1.0}}),
     {%- if op.has_beta %}
         // Warning!: Swish has > 1 inputs, beta != 1.0, actual beta value stored in binary model data
     {%- endif %}

diff --git a/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/...nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp
@@ -10,9 +10,10 @@
 
 #include "unsymmetrical_comparer.hpp"
 
-namespace LayerTestsDefinitions {
-
 using ov::test::utils::InputLayerType;
+using ov::test::utils::SequenceTestsMode;
+
+namespace LayerTestsDefinitions {
 
 class CUDNNGRUSequenceTest : public UnsymmetricalComparer<GRUSequenceTest> {
 public:
@@ -120,7 +121,7 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer<GRUSequenceTest>
         ov::ResultVector results{std::make_shared<ngraph::opset1::Result>(gru_sequence->output(0)),
                                  std::make_shared<ngraph::opset1::Result>(gru_sequence->output(1))};
         function = std::make_shared<ngraph::Function>(results, params, "gru_sequence");
-        bool ti_found = is_tensor_iterator_exist(function);
+        bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function);
         EXPECT_EQ(ti_found, false);
     }
 
@@ -150,7 +151,6 @@ TEST_P(LPCNetCUDNNGRUSequenceTest, CompareWithRefs) {
 using namespace LayerTestsDefinitions;
 
 namespace {
-using ov::test::utils::SequenceTestsMode
 SequenceTestsMode mode{SequenceTestsMode::PURE_SEQ};
 // output values increase rapidly without clip, so use only seq_lengths = 2
 std::vector<size_t> seq_lengths{1, 2, 5, 10};

diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reduce.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reduce.cpp
@@ -10,7 +10,7 @@
 
 namespace {
 using namespace LayerTestsDefinitions;
-using ov::test::utils::ReductionTypel
+using ov::test::utils::ReductionType;
 
 const std::vector<InferenceEngine::Precision> netPrecisions = {
     InferenceEngine::Precision::FP32,