sindhu/register backends

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",

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/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/ngraph_backend_manager.cc

@@ -45,6 +45,14 @@ Status BackendManager::SetBackendName(const string& backend_name) {
 }
 
 Status BackendManager::CreateBackend(const string& backend_name) {
+// Register backends for static linking
+#if defined(NGRAPH_CPU_STATIC_LIB_ENABLE)
+  ngraph_register_cpu_backend();
+#endif
+#if defined(NGRAPH_INTERPRETER_STATIC_LIB_ENABLE)
+  ngraph_register_interpreter_backend();
+#endif
+
   std::lock_guard<std::mutex> lock(BackendManager::ng_backend_map_mutex_);
   auto itr = BackendManager::ng_backend_map_.find(backend_name);
   // if backend does not exist create it

test/CMakeLists.txt

@@ -138,6 +138,10 @@ if (APPLE)
     set(NGRAPH_TF_CXX11_ABI 0)
 endif()
 
+if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+    add_definitions(-DNGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+endif()
+
 if(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
     target_link_libraries(gtest_ngtf
         -Wl,--whole-archive

test/graph_rewrites/op_by_op_capability_test.cc

@@ -62,8 +62,7 @@ TEST(OpByOpCapability, Backend) {
   ASSERT_OK(BackendManager::GetCurrentlySetBackendName(&ng_backend_type));
 
   // Map with all the backends, and what the boolean is_supported should be
-  std::map<std::string, bool> backend_map{
-      {"CPU", true}, {"INTERPRETER", true}, {"NOP", false}};
+  std::map<std::string, bool> backend_map{{"CPU", true}, {"INTERPRETER", true}};
 
   // Tests three cases of (Backend, is_supported=true/false)
   // 1. CPU, true

test/python/test_sign.py

@@ -35,7 +35,8 @@ def test_sign_1d(self, test_input, expected):
         val = tf.placeholder(tf.float32, shape=(1,))
         out = tf.sign(val)
         sess_fn = lambda sess: sess.run((out,), feed_dict={val: (test_input,)})
-        np.allclose(self.with_ngraph(sess_fn), self.without_ngraph(sess_fn))
+        assert np.allclose(
+            self.with_ngraph(sess_fn), self.without_ngraph(sess_fn))
         assert np.allclose(self.with_ngraph(sess_fn), expected)
 
     def test_sign_2d(self):

test/test_ngraph_exec.cpp

@@ -44,6 +44,13 @@ class NGraphExecTest : public ::testing::Test {
     GraphDef gdef;
     TF_RETURN_IF_ERROR(ReadTextProto(Env::Default(), graph_pbtxt_file, &gdef));
     GraphConstructorOptions opts;
+
+// Register backends for static linking
+#if defined(NGRAPH_BRIDGE_STATIC_LIB_ENABLE)
+    ngraph_register_cpu_backend();
+    ngraph_register_interpreter_backend();
+#endif
+
     // Set the allow_internal_ops to true so that graphs with node names such as
     // _arg_Placeholder_1_0_1_0_arg are allowed. These op names are generated
     // during the graph rewrite passes and considered internal