Codegen bug fixes (#2626)

Pre-build tbb wasn't getting its headers into the master header
Reference convolution changes needed to be added to codegen

src/ngraph/codegen/CMakeLists.txt

@@ -73,7 +73,8 @@ if(NGRAPH_GPU_ENABLE)
 endif()
 
 if(NGRAPH_TBB_ENABLE)
-    list(APPEND HEADER_SEARCH_DEFINES TBB_HEADERS_PATH="${TBB_ROOT}/include")
+    get_target_property(TBB_INCLUDE_DIR libtbb INTERFACE_INCLUDE_DIRECTORIES)
+    list(APPEND HEADER_SEARCH_DEFINES TBB_HEADERS_PATH="${TBB_INCLUDE_DIR}")
 endif()
 
 set_source_files_properties(compiler.cpp PROPERTIES COMPILE_DEFINITIONS "${HEADER_SEARCH_DEFINES}")

src/ngraph/runtime/cpu/cpu_emitter.cpp

@@ -2324,12 +2324,10 @@ namespace ngraph
                 }
                 else
                 {
-                    writer << "reference::convolution_backprop_filters<" << out[0].get_type()
-                           << ">(" << args[0].get_name() << ",\n";
+                    writer << "reference::convolution_backprop_filter<" << out[0].get_type() << ">("
+                           << args[0].get_name() << ",\n";
                     writer << "                         " << args[1].get_name() << ",\n";
                     writer << "                         " << out[0].get_name() << ",\n";
-                    writer << "                         {" << join(convolution->get_filters_shape())
-                           << "},\n";
                     writer << "                         {" << join(arg0_shape) << "},\n";
                     writer << "                         {" << join(arg1_shape) << "},\n";
                     writer << "                         {" << join(result_shape) << "},\n";
@@ -2340,7 +2338,7 @@ namespace ngraph
                     writer << "                         {"
                            << join(convolution->get_padding_below_forward()) << "},\n";
                     writer << "                         {"
-                           << join(convolution->get_padding_above_forward()) << "},\n";
+                           << join(convolution->compute_backward_in_pad_above()) << "},\n";
                     writer << "                         {"
                            << join(convolution->get_data_dilation_strides_forward()) << "});\n";
                 }
@@ -2377,12 +2375,10 @@ namespace ngraph
                 else
                 {
                     // Note that args[1] and args[0] are switched here from the usual order.
-                    writer << "reference::convolution_backprop_data<" << out[0].get_type() << ">("
+                    writer << "reference::convolution_backprop_in<" << out[0].get_type() << ">("
                            << args[1].get_name() << ",\n";
                     writer << "                         " << args[0].get_name() << ",\n";
                     writer << "                         " << out[0].get_name() << ",\n";
-                    writer << "                         {"
-                           << join(convolution->get_data_batch_shape()) << "},\n";
                     writer << "                         {" << join(arg1_shape) << "},\n";
                     writer << "                         {" << join(arg0_shape) << "},\n";
                     writer << "                         {" << join(result_shape) << "},\n";
@@ -2391,9 +2387,9 @@ namespace ngraph
                     writer << "                         {"
                            << join(convolution->get_window_dilation_strides_forward()) << "},\n";
                     writer << "                         {"
-                           << join(convolution->get_padding_below_forward()) << "},\n";
+                           << join(convolution->compute_backward_delta_out_pad_below()) << "},\n";
                     writer << "                         {"
-                           << join(convolution->get_padding_above_forward()) << "},\n";
+                           << join(convolution->compute_backward_delta_out_pad_above()) << "},\n";
                     writer << "                         {"
                            << join(convolution->get_window_movement_strides_forward()) << "});\n";
                 }
@@ -4137,9 +4133,9 @@ namespace ngraph
             }
 
 #undef TI
-        }
-    }
-}
+        } // namespace cpu
+    }     // namespace runtime
+} // namespace ngraph
 
 //------------------------------------------------------------------------------------------------
 // Utility methods