Merge branch 'master' into r0.15

avijit-nervana · avijit-nervana · commit 98be76ce79a5 · 2019-06-12T15:03:09.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -291,6 +291,7 @@ get_filename_component(
     ABSOLUTE
 )
 
+add_subdirectory(examples)
 if (DEFINED TF_SRC_DIR)
     message(STATUS "TensorFlow_SRC_DIR: ${TensorFlow_SRC_DIR}")
     add_subdirectory(examples/cpp)
diff --git a/src/ngraph_builder.cc b/src/ngraph_builder.cc
@@ -95,8 +95,7 @@ std::shared_ptr<TOpType> ConstructNgNode(const std::string& op_name,
                                          TArg&&... Args) {
   auto ng_node = std::make_shared<TOpType>(std::forward<TArg>(Args)...);
   ng_node->set_friendly_name(op_name);
-  // Fails for now, so commenting out for now
-  // ng_node->add_provenance_tag(op_name);
+  ng_node->add_provenance_tag(op_name);
   return ng_node;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,7 @@ get_filename_component(`
`291`	`291`	`ABSOLUTE`
`292`	`292`	`)`
`293`	`293`
	`294`	`+add_subdirectory(examples)`
`294`	`295`	`if (DEFINED TF_SRC_DIR)`
`295`	`296`	`message(STATUS "TensorFlow_SRC_DIR: ${TensorFlow_SRC_DIR}")`
`296`	`297`	`add_subdirectory(examples/cpp)`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,7 @@ std::shared_ptr<TOpType> ConstructNgNode(const std::string& op_name,`
`95`	`95`	`TArg&&... Args) {`
`96`	`96`	`auto ng_node = std::make_shared<TOpType>(std::forward<TArg>(Args)...);`
`97`	`97`	`ng_node->set_friendly_name(op_name);`
`98`		`- // Fails for now, so commenting out for now`
`99`		`- // ng_node->add_provenance_tag(op_name);`
	`98`	`+ ng_node->add_provenance_tag(op_name);`
`100`	`99`	`return ng_node;`
`101`	`100`	`}`
`102`	`101`