Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tf.Dimension raises TypeError for tf.DType #17086

Merged
merged 3 commits into from
Apr 7, 2018
Merged

tf.Dimension raises TypeError for tf.DType #17086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9afed26
BUG: raise error for Dtype
facaiy Feb 17, 2018
e83ffce
TST: add test case
facaiy Feb 17, 2018
0060366
Merge branch 'master' into BUG/tf_zeros_pass_dtype_as_shape
facaiy Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tensorflow/python/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ py_library(
srcs = ["framework/tensor_shape.py"],
srcs_version = "PY2AND3",
deps = [
":dtypes",
":util",
"//tensorflow/core:protos_all_py",
],
Expand Down
3 changes: 3 additions & 0 deletions tensorflow/python/framework/tensor_shape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from __future__ import print_function

from tensorflow.core.framework import tensor_shape_pb2
from tensorflow.python.framework import dtypes
from tensorflow.python.util import compat
from tensorflow.python.util.tf_export import tf_export

Expand All @@ -30,6 +31,8 @@ def __init__(self, value):
"""Creates a new Dimension with the given value."""
if value is None:
self._value = None
elif isinstance(value, dtypes.DType):
raise TypeError("Cannot convert %s to Dimension" % value)
else:
self._value = int(value)
if (not isinstance(value, compat.bytes_or_text_types) and
Expand Down
5 changes: 5 additions & 0 deletions tensorflow/python/framework/tensor_shape_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from __future__ import print_function

from tensorflow.core.framework import tensor_shape_pb2
from tensorflow.python.framework import dtypes
from tensorflow.python.framework import tensor_shape
from tensorflow.python.framework import test_util
from tensorflow.python.platform import googletest
Expand Down Expand Up @@ -184,6 +185,10 @@ def testStr(self):
self.assertEqual(str(tensor_shape.Dimension(7)), "7")
self.assertEqual(str(tensor_shape.Dimension(None)), "?")

def testUnsupportedType(self):
with self.assertRaises(TypeError):
tensor_shape.Dimension(dtypes.string)

def testMod(self):
four = tensor_shape.Dimension(4)
nine = tensor_shape.Dimension(9)
Expand Down