aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/data
diff options
context:
space:
mode:
authorGravatar Jiri Simsa <jsimsa@google.com>2018-10-03 11:17:48 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-10-03 11:25:22 -0700
commit880dcb7a91e5ee497045614d9c5f4ab93c9ffacf (patch)
tree8e130f98148613a0f171b13da76fcbc971e4c87a /tensorflow/python/data
parentdc262c9a376004765e7956ff6deb9bc27b045efd (diff)
Automated rollback of commit 51b266fba181dffb6b3f9207280cde6b7670dd90
PiperOrigin-RevId: 215593867
Diffstat (limited to 'tensorflow/python/data')
-rw-r--r--tensorflow/python/data/ops/dataset_ops.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/tensorflow/python/data/ops/dataset_ops.py b/tensorflow/python/data/ops/dataset_ops.py
index 3693cc88f2..46ce191f7b 100644
--- a/tensorflow/python/data/ops/dataset_ops.py
+++ b/tensorflow/python/data/ops/dataset_ops.py
@@ -1830,11 +1830,10 @@ class StructuredFunctionWrapper(object):
component = _NestedDatasetComponent(t)
flat_classes.append(component)
flat_shapes.append(component)
- flat_types.append(component)
- if t.options() != Options(): # pylint: disable=protected-access
- warnings.warn("Encountered a nested dataset with non-default "
- "options. These options will not be propagated to "
- "the outer dataset.")
+ flat_types.append(component)
+ if t.options() is not None: # pylint: disable=protected-access
+ warnings.warn("Encountered a nested dataset with options. These "
+ "options will not be applied to the outer dataset.")
else:
try:
t = ops.convert_to_tensor(t)