aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/distribute/__init__.py
diff options
context:
space:
mode:
authorGravatar Priya Gupta <priyag@google.com>2018-08-14 11:22:19 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-08-14 11:31:36 -0700
commit77fabbeabb5b9061d8c606050c1ea79aec990c03 (patch)
tree1495d6acb396eebd40c703b891a4f2e7437a8532 /tensorflow/contrib/distribute/__init__.py
parentcea262e16a004d73295259c42f21e2655da3df13 (diff)
1. Move distribution strategy context utility methods to a separate file with few dependencies. This allows us to import this in some places without creating circular dependencies as the original file imported many things.
2. Move the stack used in distribution strategy context to the graph. This allows us to use different strategies in different graphs (for e.g. in train and eval). This fixes #21412 and #21180. PiperOrigin-RevId: 208680454
Diffstat (limited to 'tensorflow/contrib/distribute/__init__.py')
-rw-r--r--tensorflow/contrib/distribute/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/contrib/distribute/__init__.py b/tensorflow/contrib/distribute/__init__.py
index 9123ca749b..5fa57f494c 100644
--- a/tensorflow/contrib/distribute/__init__.py
+++ b/tensorflow/contrib/distribute/__init__.py
@@ -22,13 +22,14 @@ from __future__ import print_function
from tensorflow.contrib.distribute.python.collective_all_reduce_strategy import CollectiveAllReduceStrategy
from tensorflow.contrib.distribute.python.cross_tower_ops import *
from tensorflow.contrib.distribute.python.mirrored_strategy import MirroredStrategy
-from tensorflow.contrib.distribute.python.multi_worker_strategy import MultiWorkerMirroredStrategy
from tensorflow.contrib.distribute.python.monitor import Monitor
+from tensorflow.contrib.distribute.python.multi_worker_strategy import MultiWorkerMirroredStrategy
from tensorflow.contrib.distribute.python.one_device_strategy import OneDeviceStrategy
from tensorflow.contrib.distribute.python.parameter_server_strategy import ParameterServerStrategy
from tensorflow.contrib.distribute.python.step_fn import *
from tensorflow.contrib.distribute.python.tpu_strategy import TPUStrategy
from tensorflow.python.training.distribute import *
+from tensorflow.python.training.distribution_strategy_context import *
from tensorflow.python.util.all_util import remove_undocumented