batch_norm

openvinotoolkit · Oct 11, 2023 · 4cd6eeb · 4cd6eeb
1 parent 2a442d9
commit 4cd6eeb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/...intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp b/...intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/adaptive_pooling.cpp
@@ -8,8 +8,6 @@
 #include "single_op_tests/adaptive_pooling.hpp"
 #include "common_test_utils/test_constants.hpp"
 
-using namespace ngraph::element;
-
 namespace {
 using ov::test::AdaPoolLayerTest;
 const std::vector<std::string> poolingModes = {"max", "avg"};

diff --git a/...ugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp b/...ugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/batch_norm.cpp
@@ -4,38 +4,33 @@
 
 #include <vector>
 
-#include "single_layer_tests/batch_norm.hpp"
-
-using namespace LayerTestsDefinitions;
+#include "single_op_tests/batch_norm.hpp"
 
 namespace {
-const std::vector<InferenceEngine::Precision> netPrecisions = {
-        InferenceEngine::Precision::FP32,
-        InferenceEngine::Precision::FP16
+using ov::test::BatchNormLayerTest;
+const std::vector<ov::element::Type> types = {
+        ov::element::f16,
+        ov::element::f32
 };
 
 const std::vector<double> epsilon = {
     1e-6,
     1e-5,
     1e-4
 };
-const std::vector<std::vector<size_t>> inputShapes = {
-        {1, 3},
-        {2, 5},
-        {1, 3, 10},
-        {1, 3, 1, 1},
-        {2, 5, 4, 4},
-};
 
+const std::vector<std::vector<ov::Shape>> inputShapes = {
+        {{1, 3}},
+        {{2, 5}},
+        {{1, 3, 10}},
+        {{1, 3, 1, 1}},
+        {{2, 5, 4, 4}},
+};
 
 const auto batchNormParams = testing::Combine(
         testing::ValuesIn(epsilon),
-        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::ValuesIn(types),
+        testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes)),
         testing::Values(ov::test::utils::DEVICE_GPU)
 );