From e9e3044d99864e2a0e65f9f2aecdd1d879aba687 Mon Sep 17 00:00:00 2001
From: Taylor Yeonbok Lee <taylor.lee@intel.com>
Date: Thu, 3 Nov 2022 23:31:41 -0700
Subject: [PATCH] Fix error in calling is_dynamic (#13769)

---
 src/plugins/intel_gpu/src/graph/concatenation.cpp           | 2 +-
 .../src/graph/graph_optimizer/concat_input_order.cpp        | 3 ++-
 .../src/graph/graph_optimizer/prepare_buffer_fusing.cpp     | 6 +++++-
 .../behavior/ov_infer_request/infer_request_dynamic.cpp     | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/plugins/intel_gpu/src/graph/concatenation.cpp b/src/plugins/intel_gpu/src/graph/concatenation.cpp
index 7f45a2c207d..61a75e7822f 100644
--- a/src/plugins/intel_gpu/src/graph/concatenation.cpp
+++ b/src/plugins/intel_gpu/src/graph/concatenation.cpp
@@ -102,8 +102,8 @@ std::string concatenation_inst::to_string(concatenation_node const& node) {
 
 concatenation_inst::typed_primitive_inst(network& network, concatenation_node const& node)
     : parent(network, node) {
+    if (node.is_dynamic()) return;
     auto input_layout = node.input().get_output_layout();
-    if (input_layout.is_dynamic()) return;
 
     auto output_layout = node.get_output_layout();
 
diff --git a/src/plugins/intel_gpu/src/graph/graph_optimizer/concat_input_order.cpp b/src/plugins/intel_gpu/src/graph/graph_optimizer/concat_input_order.cpp
index fce7fb38fb1..6c9ba57feb5 100644
--- a/src/plugins/intel_gpu/src/graph/graph_optimizer/concat_input_order.cpp
+++ b/src/plugins/intel_gpu/src/graph/graph_optimizer/concat_input_order.cpp
@@ -120,7 +120,8 @@ void concat_input_order::run(program& p) {
         // 4. Not already aligned
         // 5. Users can accept shuffled features
         // 6. No fused primitives
-        if (!node->is_type<concatenation>() || node->is_output() || (node->is_valid_output_layout() && node->is_dynamic()))
+        if (!node->is_type<concatenation>() || node->is_output() ||
+            (node->is_valid_output_layout() && node->get_output_layout().is_dynamic()))
             continue;
 
         auto& concat_node = node->as<concatenation>();
diff --git a/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_buffer_fusing.cpp b/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_buffer_fusing.cpp
index f24f0170956..2d1d5d89d30 100644
--- a/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_buffer_fusing.cpp
+++ b/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_buffer_fusing.cpp
@@ -67,6 +67,8 @@ struct concat_in_place_optimization : pattern_match_optimization_typed<concat_in
 bool concat_noop_optimization::match(concatenation_node& node) {
     if (node.is_output() && !get_program().is_debug_build())
         return false;
+    if (node.is_valid_output_layout() && node.get_output_layout().is_dynamic())
+        return false;
     return node.get_dependencies().size() == 1 &&
         !node.has_fused_primitives() &&
         node.get_fused_activations_funcs().empty();
@@ -86,6 +88,8 @@ bool concat_in_place_optimization::match(concatenation_node& node) {
         return false;
     if (node.has_fused_primitives() || !node.get_fused_activations_funcs().empty())
         return false;
+    if (node.is_valid_output_layout() && node.get_output_layout().is_dynamic())
+        return false;
 
     bool is_onednn_impl = false;
 
@@ -311,7 +315,7 @@ void prepare_buffer_fusing::run(program& p) {
     If crop is before concat there can be padding mismtach, since concat changes padding.
     */
     auto can_optimize = [](const program_node* node) {
-        if ((node->is_valid_output_layout() && node->is_dynamic()) || node->is_output() || (!node->get_fused_activations_funcs().empty())) {
+        if ((node->is_valid_output_layout() && node->get_output_layout().is_dynamic()) || node->is_output() || (!node->get_fused_activations_funcs().empty())) {
             return false;
         }
         return true;
diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp
index 11f13880ba2..b3a563e8010 100644
--- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp
+++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp
@@ -21,7 +21,6 @@ const std::vector<ov::AnyMap> AutoConfigs = {
 };
 
 const std::vector<ov::AnyMap> AutoNotSupportConfigs = {
-    {ov::device::priorities(CommonTestUtils::DEVICE_GPU)}
 };
 
 std::shared_ptr<ngraph::Function> getFunction1() {