Internal change.

tensorflower-gardener · tensorflow-copybara · commit 5936a712fe3b · 2024-10-07T17:34:33.000-07:00
PiperOrigin-RevId: 683388578
diff --git a/tensorflow_serving/servables/tensorflow/BUILD b/tensorflow_serving/servables/tensorflow/BUILD
@@ -1826,8 +1826,8 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
+        ":remote_op_config_rewriter_cc_proto",
         ":saved_model_config_cc_proto",
-        "//tensorflow_serving/servables/tensorflow:remote_op_config_rewriter_cc_proto",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
diff --git a/tensorflow_serving/servables/tensorflow/saved_model_config.proto b/tensorflow_serving/servables/tensorflow/saved_model_config.proto
@@ -11,6 +11,8 @@ option cc_enable_arenas = true;
 message SessionOverrides {
   optional tools.RemoteOpRemapConfig remote_op_remap_config = 1;
   optional BatchOpRewriteConfig batch_op_rewriter_config = 2;
+  // Disable the entire meta optimizer (off by default).
+  optional bool disable_meta_optimizer = 3;
 }
 
 message SavedModelConfig {
diff --git a/tensorflow_serving/servables/tensorflow/saved_model_config_util.cc b/tensorflow_serving/servables/tensorflow/saved_model_config_util.cc
@@ -79,6 +79,10 @@ void UpdateRewriterConfig(
         session_overrides.batch_op_rewriter_config().SerializeAsString(),
         rewrite_options);
   }
+
+  // Other rewriter options.
+  rewrite_options->set_disable_meta_optimizer(
+      session_overrides.disable_meta_optimizer());
 }
 
 absl::StatusOr<SavedModelConfig> LoadSavedModelConfigOrDefault(

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ option cc_enable_arenas = true;`
`11`	`11`	`message SessionOverrides {`
`12`	`12`	`optional tools.RemoteOpRemapConfig remote_op_remap_config = 1;`
`13`	`13`	`optional BatchOpRewriteConfig batch_op_rewriter_config = 2;`
	`14`	`+ // Disable the entire meta optimizer (off by default).`
	`15`	`+ optional bool disable_meta_optimizer = 3;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`message SavedModelConfig {`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,10 @@ void UpdateRewriterConfig(`
`79`	`79`	`session_overrides.batch_op_rewriter_config().SerializeAsString(),`
`80`	`80`	`rewrite_options);`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ // Other rewriter options.`
	`84`	`+ rewrite_options->set_disable_meta_optimizer(`
	`85`	`+ session_overrides.disable_meta_optimizer());`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`absl::StatusOr<SavedModelConfig> LoadSavedModelConfigOrDefault(`