Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / src / border.cpp

diff --git a/inference-engine/thirdparty/clDNN/src/border.cpp b/inference-engine/thirdparty/clDNN/src/border.cpp
index b07a1f9..2a2c5b6 100644 (file)
--- a/inference-engine/thirdparty/clDNN/src/border.cpp
+++ b/inference-engine/thirdparty/clDNN/src/border.cpp
@@ -30,22 +30,24 @@ primitive_type_id border_type_id()
 
 layout border_inst::calc_output_layout(border_node const& node)
 {
+    assert((bool)node.get_primitive()->output_data_type == false
+           && "Output data type forcing is not supported for border_node!");
     auto input_layout = node.input().get_output_layout();
     auto desc         = node.get_primitive();
 
     auto&& new_size = input_layout.size;
-    new_size += desc->left_top_sizes;
-    new_size += desc->right_bottom_sizes;
+    new_size += desc->left_top_sizes.sub({0, 0, 0, 0});
+    new_size += desc->right_bottom_sizes.sub({0, 0, 0, 0});
 
-    return {input_layout.data_type, input_layout.format, new_size};
+    return { input_layout.data_type, input_layout.format, {new_size.batch[0], new_size.feature[0], new_size.spatial[0], new_size.spatial[1]} };
 }
 
 std::string border_inst::to_string(border_node const& node)
 {
     auto desc = node.get_primitive();
 
-    const auto& left_top_sizes     = desc->left_top_sizes;
-    const auto& right_bottom_sizes = desc->right_bottom_sizes;
+    const auto& left_top_sizes     = desc->left_top_sizes.sub({0, 0, 0, 0});
+    const auto& right_bottom_sizes = desc->right_bottom_sizes.sub({0, 0, 0, 0});
     const auto& border_value       = std::to_string(desc->border_value);
 
     const char* border_type_str = "unknown";
@@ -80,8 +82,8 @@ border_inst::typed_primitive_inst(network_impl& network, border_node const& node
     const auto input_format = input_layout.format;
     const auto& input_sizes = input_layout.size;
 
-    auto lt_sizes = argument.left_top_sizes;
-    auto rb_sizes = argument.right_bottom_sizes;
+    auto lt_sizes = argument.left_top_sizes.sub({0, 0, 0, 0});
+    auto rb_sizes = argument.right_bottom_sizes.sub({0, 0, 0, 0});
     auto b_type   = argument.type;
 
     CLDNN_ERROR_NOT_PROPER_FORMAT(node.id(), "Input format", input_format.value, "supported border primitive input formats",