From 9bce52aa9f75a94e121bbf360248e89e9226fd11 Mon Sep 17 00:00:00 2001 From: Sami Kama Date: Fri, 21 Sep 2018 11:17:52 -0700 Subject: [PATCH 1/2] Add possibility to include default optimizers in custom optimizer list --- tensorflow/core/grappler/optimizers/meta_optimizer.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc index 4b0cbfaa82a..56ffc5a0ec9 100644 --- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc +++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc @@ -215,6 +215,16 @@ Status MetaOptimizer::InitializeCustomGraphOptimizers( TF_RETURN_IF_ERROR(custom_optimizer->Init(&optimizer_config)); optimizers->push_back(std::move(custom_optimizer)); } else { + // if there are no custom optimizers with given name, try to initalize a + // default optimizer. This way custom configurable optimizers can be + // mixed with default optimizers in any order. + auto optimizer = MakeNewOptimizer(optimizer_config.name()); + if (optimizer) { + VLOG(2) << "Registered default graph optimizer: " + << optimizer_config.name(); + optimizers->push_back(std::move(optimizer)); + continue; + } VLOG(2) << "Can't register an optimizer by name: " << optimizer_config.name(); } From 0598bbc08098e5ed0ec6f9029f301c725fcd9530 Mon Sep 17 00:00:00 2001 From: drpngx Date: Fri, 21 Sep 2018 12:29:30 -0700 Subject: [PATCH 2/2] Minor style fix. --- tensorflow/core/grappler/optimizers/meta_optimizer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc index 56ffc5a0ec9..79f8cfe35e7 100644 --- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc +++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc @@ -215,8 +215,8 @@ Status MetaOptimizer::InitializeCustomGraphOptimizers( TF_RETURN_IF_ERROR(custom_optimizer->Init(&optimizer_config)); optimizers->push_back(std::move(custom_optimizer)); } else { - // if there are no custom optimizers with given name, try to initalize a - // default optimizer. This way custom configurable optimizers can be + // If there are no custom optimizers with given name, try to initalize a + // default optimizer. This way, custom configurable optimizers can be // mixed with default optimizers in any order. auto optimizer = MakeNewOptimizer(optimizer_config.name()); if (optimizer) {