Move optimizations to arithmetic optimizer stages

1) Redundant Bitcast
2) Redundant Cast
3) Remove inverse transpose

PiperOrigin-RevId: 188569367

1 files changed, 5 insertions, 3 deletions

diff --git a/tensorflow/core/grappler/optimizers/arithmetic_optimizer.h b/tensorflow/core/grappler/optimizers/arithmetic_optimizer.h
index 9cff8ca9d0..787084454d 100644
--- a/tensorflow/core/grappler/optimizers/arithmetic_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/arithmetic_optimizer.h
@@ -55,14 +55,16 @@ class ArithmeticOptimizer : public GraphOptimizer {
 
   // Granular control for arithmetic optimizer stages
   struct ArithmeticOptimizerOptions {
-    // rewrite a tree of Add/AddN ops with a single AddN
-    bool enable_add_to_addn_combining;
+    bool combine_add_to_addn = true;
+    bool remove_inverse_transpose = true;
+    bool remove_redundant_bitcast = true;
+    bool remove_redundant_cast = true;
 
     // Choose which arithmetic optimizer stages will be enabled for a given
     // optimization level by default.
     static ArithmeticOptimizerOptions Default(
         RewriterConfig::Toggle opt_level) {
-      return {/*enable_add_to_addn_combining*/ true};
+      return ArithmeticOptimizerOptions();
     }
   };