experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated rollback of commit d2ecf4da67. Revert #29987.

Browse Source 
PiperOrigin-RevId: 259914773
This commit is contained in:
Tom Hennigan 2019-07-25 03:06:19 -07:00 committed by TensorFlower Gardener
parent 5518980ae5
commit f3a7982794
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tensorflow/python/kernel_tests/init_ops_test.py
View File

@ -537,13 +537,6 @@ class RangeTest(test.TestCase):
math_ops.range( math_ops.range(
0, 0, 1, dtype=dtypes.float64).dtype, dtypes.float64) 0, 0, 1, dtype=dtypes.float64).dtype, dtypes.float64)
def testMixedDType(self):
# Test case for GitHub issue 29867
with self.cached_session(use_gpu=True):
tf_ans = math_ops.range(constant_op.constant(5), dtype=dtypes.float32)
self.assertAllEqual(
self.evaluate(tf_ans), np.arange(np.int32(5), dtype=np.float32))
# TODO(vrv): move to sequence_ops_test? # TODO(vrv): move to sequence_ops_test?
class LinSpaceTest(test.TestCase): class LinSpaceTest(test.TestCase):

17
tensorflow/python/ops/math_ops.py
View File

@ -1349,20 +1349,9 @@ def range(start, limit=None, delta=1, dtype=None, name="range"): # pylint: disa
start, limit = 0, start start, limit = 0, start
with ops.name_scope(name, "Range", [start, limit, delta]) as name: with ops.name_scope(name, "Range", [start, limit, delta]) as name:
# In case dtype is not none, cast start, limit, and delta directly. start = ops.convert_to_tensor(start, dtype=dtype, name="start")
# Otherwise pass to convert_to_tensor. This is to handle limit = ops.convert_to_tensor(limit, dtype=dtype, name="limit")
# the situation with: delta = ops.convert_to_tensor(delta, dtype=dtype, name="delta")
# tf.range(tf.constant(5), dtype=tf.float32)
# which is comparable with:
# np.arange(np.int(5), dtype=np.float32)
if dtype is not None:
start = cast(start, dtype=dtype, name="start")
limit = cast(limit, dtype=dtype, name="limit")
delta = cast(delta, dtype=dtype, name="delta")
else:
start = ops.convert_to_tensor(start, name="start")
limit = ops.convert_to_tensor(limit, name="limit")
delta = ops.convert_to_tensor(delta, name="delta")
# infer dtype if not explicitly provided # infer dtype if not explicitly provided
if dtype is None: if dtype is None: