Fix PartialShape comparison related issues on TensorIterator/LSTMSequ…

…enceTest Signed-off-by: Andrew Park <[email protected]>
ahnyoung-paul · May 26, 2022 · 664175c · 664175c
1 parent f2f83f8
commit 664175c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp
@@ -428,6 +428,8 @@ struct layout {
 
     layout convert_to_weights_layout(bool is_grouped) const;
 
+    layout get_layout_with_dims() const;
+
     std::string to_string() const;
 
     bool is_dynamic() const;

diff --git a/src/plugins/intel_gpu/src/graph/input_layout.cpp b/src/plugins/intel_gpu/src/graph/input_layout.cpp
@@ -59,7 +59,13 @@ void input_layout_inst::set_data(memory::ptr mem) {
 
     _has_valid_input = true;
     _output_changed = true;
-    _shape_changed = mem->get_layout() != ol;
+    auto check_shape_changed = [&]() {
+        if (ol.is_dynamic())
+            return mem->get_layout() != ol;
+        else
+            return mem->get_layout().get_layout_with_dims() != ol.get_layout_with_dims();
+    };
+    _shape_changed = check_shape_changed();
 
     if (_shape_changed) {
         node.invalidate_users();

diff --git a/src/plugins/intel_gpu/src/graph/primitive_inst.cpp b/src/plugins/intel_gpu/src/graph/primitive_inst.cpp
@@ -202,9 +202,9 @@ void primitive_inst::update_impl() {
 void primitive_inst::check_memory_to_set(const memory& mem, const layout& layout) const {
     CLDNN_ERROR_LAYOUT_MISMATCH("network layout",
         "set memory layout",
-        mem.get_layout(),
+        mem.get_layout().get_layout_with_dims(),
         "expected layout",
-        layout,
+        layout.get_layout_with_dims(),
         "");
 
     // check shared image/buffer compatibility, if applicable

diff --git a/src/plugins/intel_gpu/src/graph/reshape.cpp b/src/plugins/intel_gpu/src/graph/reshape.cpp
@@ -26,6 +26,9 @@ layout reshape_inst::calc_output_layout(reshape_node const& node) {
 
     if (input_layout.is_static()) {
         auto sizes = prim->output_shape;
+        if (sizes.size() < input_layout.format.dimension()) {
+            sizes.insert(sizes.end(), input_layout.format.dimension() - sizes.size(), 1);
+        }
         auto input_sizes = input_layout.get_dims();
         int64_t need_recalc = -1;
         ov::Dimension::value_type shape_count = 1;

diff --git a/src/plugins/intel_gpu/src/runtime/layout.cpp b/src/plugins/intel_gpu/src/runtime/layout.cpp
@@ -136,6 +136,18 @@ layout layout::convert_to_weights_layout(bool is_grouped) const {
     return layout{data_type, fmt, size};
 }
 
+layout layout::get_layout_with_dims() const {
+    if (is_dynamic())
+        throw std::runtime_error("[GPU] get_layout_with_dims() is called for dynamic shape");
+
+    if (size.size() < format.dimension()) {
+        auto dims = get_dims();
+        auto pshape = ov::PartialShape(ov::Shape(dims.begin(), dims.end()));
+        return layout{data_type, format, pshape, data_padding};
+    }
+    return layout{data_type, format, size, data_padding};
+}
+
 std::vector<tensor::value_type> layout::get_ordered_dims() const {
     throw std::runtime_error("get_ordered_dims is not implemented yet");
 }