diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-05-24 19:12:26 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-05-24 19:15:01 -0700 |
| commit | b59833c3fd91511b33255369016868e4ae6cda2e (patch) | |
| tree | ecbd70cfd3abb5d934f6eb4b7280a35e8589f5cf /tensorflow/python/framework/test_util.py | |
| parent | 2b99d9cbc7166efedaff9eee11744348da30fc8a (diff) | |
Merge changes from github.
Revert #18413. Too many internal test failures due to the name scope change caused by this change.
Revert #18192. Cannot use re2::StringPiece internally. Need alternative for set call. Will pull and clean this up in a separate change.
PiperOrigin-RevId: 197991247
Diffstat (limited to 'tensorflow/python/framework/test_util.py')
| -rw-r--r-- | tensorflow/python/framework/test_util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py index 97cd22e47a..5b01df48fe 100644 --- a/tensorflow/python/framework/test_util.py +++ b/tensorflow/python/framework/test_util.py @@ -682,7 +682,7 @@ def run_in_graph_and_eager_modes(__unused__=None, Args: - __unused__: Prevents sliently skipping tests. + __unused__: Prevents silently skipping tests. config: An optional config_pb2.ConfigProto to use to configure the session when executing graphs. use_gpu: If True, attempt to run as many operations as possible on GPU. |