From ad21c6d3a4037cb4fd2ef0f6ca7b719ff54d983c Mon Sep 17 00:00:00 2001
From: Vladimir Paramuzov <vladimir.paramuzov@intel.com>
Date: Tue, 16 Feb 2021 08:43:31 +0300
Subject: [PATCH] [IE CLDNN] Fixed dynamic batch for 2D layout (#3992)

---
 inference-engine/src/cldnn_engine/ops/parameter.cpp        | 7 +++----
 .../gpu/shared_tests_instances/skip_tests_config.cpp       | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/inference-engine/src/cldnn_engine/ops/parameter.cpp b/inference-engine/src/cldnn_engine/ops/parameter.cpp
index 57cd325b8d4..19f39dfe8a4 100644
--- a/inference-engine/src/cldnn_engine/ops/parameter.cpp
+++ b/inference-engine/src/cldnn_engine/ops/parameter.cpp
@@ -36,9 +36,8 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
     }
 
     cldnn::tensor dataTensor;
-    cldnn::tensor::value_type batch = (p.m_max_batch <= 1)
-                                    ? (inputDims.size() > 3 ? TensorValue(inputDims[0]) : 1)
-                                    : TensorValue(p.m_curBatch);
+    cldnn::tensor::value_type batch = (p.m_max_batch <= 1) ? (!inputDims.empty() ? TensorValue(inputDims[0]) : 1)
+                                                           : TensorValue(p.m_curBatch);
     switch (inputDims.size()) {
     case 6:
         dataTensor = cldnn::tensor(cldnn::batch(batch),
@@ -74,7 +73,7 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
         break;
     case 2:
         if (Layout::NCHW == l || NC == l) {
-            dataTensor = cldnn::tensor(TensorValue(inputDims[0]), TensorValue(inputDims[1]), 1, 1);
+            dataTensor = cldnn::tensor(batch, TensorValue(inputDims[1]), 1, 1);
         } else {
             THROW_IE_EXCEPTION << "Unsupported layout (" << l << ") in 2D input " << inputInfo->name();
         }
diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
index 2d2590eb4ca..a06d52df483 100644
--- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
+++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
@@ -56,7 +56,5 @@ std::vector<std::string> disabledTestPatterns() {
 
             // INT8 StridedSlice not supported
             R"(.*(LPT/StridedSliceTransformation).*)",
-            // TODO: Issue: 47219
-            R"(.*DynamicBatchTest.*)",
     };
 }