Merge remote-tracking branch 'origin/master' into shrestha/tag_rc3

Author: Shrestha Malik

CMakeLists.txt

@@ -275,6 +275,9 @@ if (NOT USE_PRE_BUILT_NGRAPH)
 endif()
 set(NGRAPH_INSTALL_DIR ${NGRAPH_ARTIFACTS_DIR})
 
+if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+endif()
 
 if(OS_VERSION STREQUAL "\"centos\"")
     set(LIB "lib64")

bazel/BUILD

@@ -134,6 +134,7 @@ cc_library(
         "-Wno-strict-overflow",
         '-D NGRAPH_BRIDGE_STATIC_LIB_ENABLE',
         '-D NGRAPH_TF_USE_GRAPPLER_OPTIMIZER',
+        '-D NGRAPH_CPU_STATIC_LIB_ENABLE',
         "-I ngraph_bridge",
         "-I logging",
         "-I external/ngraph/src",

bazel/ngraph.BUILD

@@ -166,6 +166,7 @@ cc_library(
         "src/ngraph/runtime/cpu/builder/convert.cpp",
         "src/ngraph/runtime/cpu/builder/convert_layout.cpp",
         "src/ngraph/runtime/cpu/builder/convolution.cpp",
+        "src/ngraph/runtime/cpu/builder/cum_sum.cpp",
         "src/ngraph/runtime/cpu/builder/dot.cpp",
         "src/ngraph/runtime/cpu/builder/dropout.cpp",
         "src/ngraph/runtime/cpu/builder/embedding_lookup.cpp",

build_ngtf.py

@@ -412,6 +412,7 @@ def main():
 
     if (arguments.use_ngraph_staticlibs):
         ngraph_tf_cmake_flags.extend(["-DNGRAPH_BRIDGE_STATIC_LIB_ENABLE=TRUE"])
+
     if (arguments.debug_build):
         ngraph_tf_cmake_flags.extend(["-DCMAKE_BUILD_TYPE=Debug"])
 

examples/cpp/hello_tf.cpp

@@ -35,16 +35,20 @@
 using namespace std;
 
 // Prints the available backends
-void PrintAvailableBackends() {
+int PrintAvailableBackends() {
   // Get the list of backends
   auto supported_backends =
       tensorflow::ngraph_bridge::BackendManager::GetSupportedBackendNames();
   vector<string> backends(supported_backends.begin(), supported_backends.end());
-
-  cout << "Available backends: " << endl;
+  if (backends.empty()) {
+    std::cout << "No backend available " << std::endl;
+    return -1;
+  }
+  std::cout << "Available backends: " << std::endl;
   for (auto& backend_name : backends) {
-    cout << "Backend: " << backend_name << std::endl;
+    std::cout << "Backend: " << backend_name << std::endl;
   }
+  return 0;
 }
 
 // Create a simple computation graph and run
@@ -116,13 +120,18 @@ void PrintVersion() {
                     ? std::string("Yes")
                     : std::string("No"))
             << std::endl;
-
-  PrintAvailableBackends();
+  std::cout << std::endl;
 }
 
 int main(int argc, char** argv) {
   PrintVersion();
 
+  // Print the avialable backends and if none are available
+  // error out
+  if (PrintAvailableBackends()) {
+    return -1;
+  }
+
   // Run a simple example
   RunSimpleNetworkExample();
 

examples/cpp/inference/CMakeLists.txt

@@ -61,6 +61,10 @@ if (APPLE)
     add_definitions(-DTEST_SINGLE_INSTANCE)
 endif()
 
+if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+endif()
+
 if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
     target_link_libraries(${APP_NAME} 
         -Wl,--whole-archive

examples/cpp/inference/infer_multiple_networks.cc

@@ -164,6 +164,13 @@ int main(int argc, char** argv) {
     return -1;
   }
 
+// Register cpu backend for static linking
+// [TODO]: Revisit this to see if we can remove registering here and register
+// only in BackendManager.
+#if defined(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+  ngraph_register_cpu_backend();
+#endif
+
   const char* backend = "CPU";
   if (SetNGraphBackend(backend) != tf::Status::OK()) {
     std::cout << "Error: Cannot set the backend: " << backend << std::endl;

examples/cpp/inference/infer_single_network.cc

@@ -160,6 +160,11 @@ int main(int argc, char** argv) {
     return -1;
   }
 
+// Register cpu backend for static linking
+#if defined(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+  ngraph_register_cpu_backend();
+#endif
+
   const char* backend = "CPU";
   if (SetNGraphBackend(backend) != tf::Status::OK()) {
     std::cout << "Error: Cannot set the backend: " << backend << std::endl;

ngraph_bridge/CMakeLists.txt

@@ -98,6 +98,18 @@ if(NGRAPH_TF_ENABLE_VARIABLES_AND_OPTIMIZERS)
     add_definitions(-DNGRAPH_TF_ENABLE_VARIABLES_AND_OPTIMIZERS)
 endif()
 
+if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+endif()
+
+if(NGRAPH_CPU_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_CPU_STATIC_LIB_ENABLE)
+endif()
+
+if(NGRAPH_INTERPRETER_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_INTERPRETER_STATIC_LIB_ENABLE)
+endif()
+
 
 if(NGRAPH_TF_USE_GRAPPLER_OPTIMIZER)            
     list(REMOVE_ITEM SRC ngraph_rewrite_pass.cc)

ngraph_bridge/enable_variable_ops/ngraph_rewrite_pass.cc

@@ -226,8 +226,12 @@ class NGraphEncapsulationPass : public NGraphRewritePass {
 
     // 4. Encapsulate clusters then, if requested, dump the graphs.
     FunctionDefLibrary* fdeflib_new = new FunctionDefLibrary();
-    TF_RETURN_IF_ERROR(EncapsulateClusters(options.graph->get(), idx,
-                                           fdeflib_new, config_map, {0, {}}));
+    auto status = EncapsulateClusters(options.graph->get(), idx, fdeflib_new,
+                                      config_map, {0, {}});
+    if (status != Status::OK()) {
+      delete (fdeflib_new);
+      return status;
+    }
     // TODO: not using fdeflib_new in this path. Only grappler path uses it
     free(fdeflib_new);
     if (DumpEncapsulatedGraphs()) {