[Log] Refactor TF_EMBEDDING_FBJ_OPT optimization pass logs.

Author: liutongxuan

tensorflow/core/common_runtime/graph_execution_state.cc

@@ -782,10 +782,10 @@ Status GraphExecutionState::InitBaseGraph(std::unique_ptr<Graph>&& new_graph) {
       ReadStringFromEnvVar("TARGET_NODES_NAME", "", &tn);
       std::vector<std::string> target_nodes;
       for (std::string s : str_util::Split(tn, ';')) {
-	target_nodes.push_back(s.substr(0, s.find_last_of(':')));
+        target_nodes.push_back(s.substr(0, s.find_last_of(':')));
       }
-      SmartStageGraph(&new_graph, target_nodes, 
-		      session_optimizer_options.do_smart_stage_gpu());
+      SmartStageGraph(&new_graph, target_nodes,
+          session_optimizer_options.do_smart_stage_gpu());
     }
   }
 

tensorflow/core/graph/embedding_pass.cc

@@ -33,16 +33,21 @@ void VLogGraphDebugString(Graph* g) {
 
 class EmbeddingForwardBackwardJointOptimizationPass : public GraphOptimizationPass {
  public:
+  EmbeddingForwardBackwardJointOptimizationPass() : GraphOptimizationPass() {
+    tensorflow::ReadBoolFromEnvVar("TF_EMBEDDING_FBJ_OPT",
+                                   /*default_val=*/false, &embedding_fbj_opt_);
+    if (!embedding_fbj_opt_) {
+      VLOG(2) << "Graph Optimization Pass TF_EMBEDDING_FBJ_OPT is off.";
+    } else {
+      VLOG(2) << "Graph Optimization Pass TF_EMBEDDING_FBJ_OPT is on.";
+    }
+  }
+
   Status Run(const GraphOptimizationPassOptions& options) override {
-    bool embedding_fbj_opt = false;
-    TF_CHECK_OK(
-        tensorflow::ReadBoolFromEnvVar("TF_EMBEDDING_FBJ_OPT",
-                                       /*default_val=*/false, &embedding_fbj_opt));
-    if (!embedding_fbj_opt) {
-      LOG(INFO) << "TF_EMBEDDING_FBJ_OPT off.";
+    if (!embedding_fbj_opt_) {
       return Status::OK();
     }
-    LOG(INFO) << "TF_EMBEDDING_FBJ_OPT on.";
+
     if (options.graph == nullptr) {
       // TODO(apassos) returning OK feels weird here as we can't do anything
       // without a graph, but some tests require this.
@@ -198,7 +203,10 @@ class EmbeddingForwardBackwardJointOptimizationPass : public GraphOptimizationPa
     return Status::OK();
   }
 
+ private:
+  bool embedding_fbj_opt_ = false;
 };
+
 REGISTER_OPTIMIZATION(OptimizationPassRegistry::POST_REWRITE_FOR_EXEC, 0,
                       EmbeddingForwardBackwardJointOptimizationPass);