From a593c6885bec8c545665ec2f25d794777be55ba9 Mon Sep 17 00:00:00 2001 From: Reed Wanderman-Milne Date: Mon, 8 Oct 2018 21:23:08 -0700 Subject: Automated rollback of commit 07df147ab20c4a5329148e5fb5f7f6b187cb73a4 PiperOrigin-RevId: 216299809 --- tensorflow/core/grappler/optimizers/meta_optimizer.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tensorflow') diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc index 7488cedec5..225c0a91e3 100644 --- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc +++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc @@ -114,8 +114,7 @@ std::unique_ptr MetaOptimizer::MakeNewOptimizer( MK_OPT("scoped_allocator", new ScopedAllocatorOptimizer(cfg_.scoped_allocator_optimization(), cfg_.scoped_allocator_opts())); - MK_OPT("pin_to_host", - new PinToHostOptimizer(cfg_.pin_to_host_optimization())); + MK_OPT("small_op", new PinToHostOptimizer(cfg_.pin_to_host_optimization())); return std::unique_ptr(); } @@ -162,7 +161,7 @@ Status MetaOptimizer::InitializeOptimizers( if (cfg_.remapping() != RewriterConfig::OFF) { optimizers->push_back(MakeUnique(cfg_.remapping())); } - if (cfg_.pin_to_host_optimization() != RewriterConfig::OFF) { + if (cfg_.pin_to_host_optimization() == RewriterConfig::ON) { optimizers->push_back(MakeUnique()); } if (cfg_.arithmetic_optimization() != RewriterConfig::OFF) { @@ -592,7 +591,7 @@ bool MetaOptimizerEnabled(const RewriterConfig& cfg) { cfg.memory_optimization() != RewriterConfig::NO_MEM_OPT || cfg.debug_stripper() == RewriterConfig::ON || cfg.scoped_allocator_optimization() == RewriterConfig::ON || - cfg.pin_to_host_optimization() != RewriterConfig::OFF || + cfg.pin_to_host_optimization() == RewriterConfig::ON || !cfg.optimizers().empty() || !cfg.custom_optimizers().empty(); } -- cgit v1.2.3