Skip to content

Commit

Permalink
[BugFix]Fix randint_like bugs when save program that don't need use t…
Browse files Browse the repository at this point in the history 
…ensor's value (#44446)

* fix bugs of random

* fix unittest error

* fix unittest bugs
  • Loading branch information
@YuanRisheng
YuanRisheng authored Jul 21, 2022
1 parent d373f4f commit 5414694
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 54 deletions.
115 changes: 67 additions & 48 deletions python/paddle/fluid/tests/unittests/test_randint_like.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,7 @@ def test_static_api(self):
x_bool = paddle.fluid.data(name="x_bool",
shape=[10, 12],
dtype="bool")
x_int32 = paddle.fluid.data(name="x_int32",
shape=[10, 12],
dtype="int32")
x_int64 = paddle.fluid.data(name="x_int64",
shape=[10, 12],
dtype="int64")
x_float16 = paddle.fluid.data(name="x_float16",
shape=[10, 12],
dtype="float16")
x_float32 = paddle.fluid.data(name="x_float32",
shape=[10, 12],
dtype="float32")
x_float64 = paddle.fluid.data(name="x_float64",
shape=[10, 12],
dtype="float64")

exe = paddle.static.Executor(self.place)

# x dtype is bool output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist1 = [
paddle.randint_like(x_bool, low=-10, high=10, dtype=dtype)
Expand All @@ -69,7 +52,11 @@ def test_static_api(self):
for out, dtype in zip(outs1, self.dtype):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -10) & (out <= 10)).all(), True)

with program_guard(Program(), Program()):
x_int32 = paddle.fluid.data(name="x_int32",
shape=[10, 12],
dtype="int32")
exe = paddle.static.Executor(self.place)
# x dtype is int32 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist2 = [
paddle.randint_like(x_int32, low=-5, high=10, dtype=dtype)
Expand All @@ -80,6 +67,11 @@ def test_static_api(self):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -5) & (out <= 10)).all(), True)

with program_guard(Program(), Program()):
x_int64 = paddle.fluid.data(name="x_int64",
shape=[10, 12],
dtype="int64")
exe = paddle.static.Executor(self.place)
# x dtype is int64 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist3 = [
paddle.randint_like(x_int64, low=-100, high=100, dtype=dtype)
Expand All @@ -89,18 +81,28 @@ def test_static_api(self):
for out, dtype in zip(outs3, self.dtype):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -100) & (out <= 100)).all(), True)
if paddle.is_compiled_with_cuda():
with program_guard(Program(), Program()):
x_float16 = paddle.fluid.data(name="x_float16",
shape=[10, 12],
dtype="float16")
exe = paddle.static.Executor(self.place)
# x dtype is float16 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist4 = [
paddle.randint_like(x_float16, low=-3, high=25, dtype=dtype)
for dtype in self.dtype
]
outs4 = exe.run(feed={'x_float16': self.x_float16},
fetch_list=outlist4)
for out, dtype in zip(outs4, self.dtype):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -3) & (out <= 25)).all(), True)

# x dtype is float16 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist4 = [
paddle.randint_like(x_float16, low=-3, high=25, dtype=dtype)
for dtype in self.dtype
]
outs4 = exe.run(feed={'x_float16': self.x_float16},
fetch_list=outlist4)
for out, dtype in zip(outs4, self.dtype):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -3) & (out <= 25)).all(), True)

with program_guard(Program(), Program()):
x_float32 = paddle.fluid.data(name="x_float32",
shape=[10, 12],
dtype="float32")
exe = paddle.static.Executor(self.place)
# x dtype is float32 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist5 = [
paddle.randint_like(x_float32, low=-25, high=25, dtype=dtype)
Expand All @@ -112,6 +114,11 @@ def test_static_api(self):
self.assertTrue(out.dtype, np.dtype(dtype))
self.assertTrue(((out >= -25) & (out <= 25)).all(), True)

with program_guard(Program(), Program()):
x_float64 = paddle.fluid.data(name="x_float64",
shape=[10, 12],
dtype="float64")
exe = paddle.static.Executor(self.place)
# x dtype is float64 output dtype in ["bool", "int32", "int64", "float16", "float32", "float64"]
outlist6 = [
paddle.randint_like(x_float64, low=-16, high=16, dtype=dtype)
Expand All @@ -125,10 +132,10 @@ def test_static_api(self):

def test_dygraph_api(self):
paddle.disable_static(self.place)
# x dtype ["bool", "int32", "int64", "float16", "float32", "float64"]
# x dtype ["bool", "int32", "int64", "float32", "float64"]
for x in [
self.x_bool, self.x_int32, self.x_int64, self.x_float16,
self.x_float32, self.x_float64
self.x_bool, self.x_int32, self.x_int64, self.x_float32,
self.x_float64
]:
x_inputs = paddle.to_tensor(x)
# self.dtype ["bool", "int32", "int64", "float16", "float32", "float64"]
Expand All @@ -140,7 +147,18 @@ def test_dygraph_api(self):
self.assertTrue(out.numpy().dtype, np.dtype(dtype))
self.assertTrue(
((out.numpy() >= -100) & (out.numpy() <= 100)).all(), True)

# x dtype ["float16"]
if paddle.is_compiled_with_cuda():
x_inputs = paddle.to_tensor(self.x_float16)
# self.dtype ["bool", "int32", "int64", "float16", "float32", "float64"]
for dtype in self.dtype:
out = paddle.randint_like(x_inputs,
low=-100,
high=100,
dtype=dtype)
self.assertTrue(out.numpy().dtype, np.dtype(dtype))
self.assertTrue(
((out.numpy() >= -100) & (out.numpy() <= 100)).all(), True)
paddle.enable_static()

def test_errors(self):
Expand Down Expand Up @@ -203,21 +221,22 @@ def test_errors(self):

# x dtype is float16
# low is 5 and high is 5, low must less then high
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
low=5,
high=5)
# low(default value) is 0 and high is -5, low must less then high
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
high=-5)
# if high is None, low must be greater than 0
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
low=-5)
if paddle.is_compiled_with_cuda():
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
low=5,
high=5)
# low(default value) is 0 and high is -5, low must less then high
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
high=-5)
# if high is None, low must be greater than 0
self.assertRaises(ValueError,
paddle.randint_like,
x_float16,
low=-5)

# x dtype is float32
# low is 5 and high is 5, low must less then high
Expand Down
8 changes: 2 additions & 6 deletions python/paddle/tensor/random.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ def randint_like(x, low=0, high=None, dtype=None, name=None):
dtype = x.dtype
if not isinstance(dtype, core.VarDesc.VarType):
dtype = convert_np_dtype_to_dtype_(dtype)
shape = x.shape
shape = paddle.shape(x)

if low >= high:
raise ValueError(
Expand All @@ -888,17 +888,13 @@ def randint_like(x, low=0, high=None, dtype=None, name=None):
['bool', 'float16', 'float32', 'float64', 'int32', 'int64'],
'randint_like')

inputs = dict()
inputs = {"ShapeTensor": shape}
attrs = {
'low': low,
'high': high,
'seed': 0,
'dtype': core.VarDesc.VarType.INT64
}
utils.get_shape_tensor_inputs(inputs=inputs,
attrs=attrs,
shape=shape,
op_type='randint_like')

helper = LayerHelper("randint", **locals())
out = helper.create_variable_for_type_inference(
Expand Down

0 comments on commit 5414694

Please sign in to comment.