Publishing 2019 R1 content

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

diff --git a/inference-engine/thirdparty/clDNN/src/gemm.cpp b/inference-engine/thirdparty/clDNN/src/gemm.cpp
index a8072bc..49f8cc7 100644 (file)
--- a/inference-engine/thirdparty/clDNN/src/gemm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gemm.cpp
@@ -31,6 +31,8 @@ primitive_type_id gemm_type_id()
 
 layout gemm_inst::calc_output_layout(gemm_node const& node)
 {
+    assert((bool)node.get_primitive()->output_data_type == false
+           && "Output data type forcing is not supported for gemm_node!");
     auto input1_layout = node.input(0).get_output_layout();
     auto input2_layout = node.input(1).get_output_layout();
     bool transpose_input1 = node.get_primitive()->transpose_input1;
@@ -89,8 +91,8 @@ gemm_inst::typed_primitive_inst(network_impl& network, gemm_node const& node)
         if (node.inputs_count() > 2)
         {
             auto input3_layout = node.input(2).get_output_layout();
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input_layout.size.spatial[1], "");
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[1], "Input2 Rows count", input2_layout.size.spatial[0], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Columns count", input3_layout.size.spatial[0], "Input2 Columns count", input2_layout.size.spatial[0], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Rows count", input3_layout.size.spatial[1], "Input1 Rows count", input_layout.size.spatial[1], "");
         }
     }
 
@@ -100,8 +102,8 @@ gemm_inst::typed_primitive_inst(network_impl& network, gemm_node const& node)
         if (node.inputs_count() > 2)
         {
             auto input3_layout = node.input(2).get_output_layout();
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input_layout.size.spatial[0], "");
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[1], "Input2 Rows count", input2_layout.size.spatial[0], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input13 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input2_layout.size.spatial[1], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Rows count", input3_layout.size.spatial[1], "Input1 Rows count", input_layout.size.spatial[1], "");
         }
     }
     else if (transpose_input1 && !transpose_input2)
@@ -110,8 +112,8 @@ gemm_inst::typed_primitive_inst(network_impl& network, gemm_node const& node)
         if (node.inputs_count() > 2)
         {
             auto input3_layout = node.input(2).get_output_layout();
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input_layout.size.spatial[1], "");
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[1], "Input2 Rows count", input2_layout.size.spatial[1], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Columns count", input3_layout.size.spatial[0], "Input2 Columns count", input2_layout.size.spatial[0], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Rows count", input3_layout.size.spatial[1], "Input1 Columns count", input_layout.size.spatial[0], "");
         }
     }
     else
@@ -120,8 +122,8 @@ gemm_inst::typed_primitive_inst(network_impl& network, gemm_node const& node)
         if (node.inputs_count() > 2)
         {
             auto input3_layout = node.input(2).get_output_layout();
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input_layout.size.spatial[0], "");
-            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input1 Columns count", input3_layout.size.spatial[1], "Input2 Rows count", input2_layout.size.spatial[1], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Columns count", input3_layout.size.spatial[0], "Input2 Rows count", input2_layout.size.spatial[1], "");
+            CLDNN_ERROR_NOT_EQUAL(node.id(), "Input3 Rows count", input3_layout.size.spatial[1], "Input1 Columns count", input_layout.size.spatial[0], "");
         }
     }