diff options
author | Reed Wanderman-Milne <reedwm@google.com> | 2018-10-08 21:23:08 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-08 21:27:43 -0700 |
commit | a593c6885bec8c545665ec2f25d794777be55ba9 (patch) | |
tree | 4dea9c09c19af86116ffa2997fba9d6184b0367c /tensorflow | |
parent | 375c109659d2d0e6265447dffdeb460693b3cccf (diff) |
Automated rollback of commit 07df147ab20c4a5329148e5fb5f7f6b187cb73a4
PiperOrigin-RevId: 216299809
Diffstat (limited to 'tensorflow')
-rw-r--r-- | tensorflow/core/grappler/optimizers/meta_optimizer.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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<GraphOptimizer> 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<GraphOptimizer>(); } @@ -162,7 +161,7 @@ Status MetaOptimizer::InitializeOptimizers( if (cfg_.remapping() != RewriterConfig::OFF) { optimizers->push_back(MakeUnique<Remapper>(cfg_.remapping())); } - if (cfg_.pin_to_host_optimization() != RewriterConfig::OFF) { + if (cfg_.pin_to_host_optimization() == RewriterConfig::ON) { optimizers->push_back(MakeUnique<PinToHostOptimizer>()); } 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(); } |