Skip to content

[Eager] optimize same python api logic #49473

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

Merged
merged 4 commits into from
Jan 5, 2023
Merged

[Eager] optimize same python api logic #49473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baf8cb8
[Eager] optimize same python api logic
veyron95 Dec 30, 2022
2dc5ef9
optimize full api
veyron95 Dec 30, 2022
18afd58
optimize logic
veyron95 Jan 3, 2023
0f2ba83
optimize logic
veyron95 Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions python/paddle/fft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,12 +1440,12 @@ def fft_c2c(x, n, axis, norm, forward, name):
_check_fft_n(n)
s = [n]
x = _resize_fft_input(x, s, axes)
op_type = 'fft_c2c'

check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)
if in_dygraph_mode():
out = _C_ops.fft_c2c(x, axes, norm, forward)
else:
op_type = 'fft_c2c'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)
inputs = {
'X': [x],
}
Expand All @@ -1472,12 +1472,13 @@ def fft_r2c(x, n, axis, norm, forward, onesided, name):
_check_fft_n(n)
s = [n]
x = _resize_fft_input(x, s, axes)
op_type = 'fft_r2c'
check_variable_and_dtype(x, 'x', ['float16', 'float32', 'float64'], op_type)

if in_dygraph_mode():
out = _C_ops.fft_r2c(x, axes, norm, forward, onesided)
else:
op_type = 'fft_r2c'
check_variable_and_dtype(
x, 'x', ['float16', 'float32', 'float64'], op_type
)
inputs = {
'X': [x],
}
Expand Down Expand Up @@ -1513,15 +1514,15 @@ def fft_c2r(x, n, axis, norm, forward, name):
_check_fft_n(n)
s = [n // 2 + 1]
x = _resize_fft_input(x, s, axes)
op_type = 'fft_c2r'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)

if in_dygraph_mode():
if n is not None:
out = _C_ops.fft_c2r(x, axes, norm, forward, n)
else:
out = _C_ops.fft_c2r(x, axes, norm, forward, 0)
else:
op_type = 'fft_c2r'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)
inputs = {
'X': [x],
}
Expand Down Expand Up @@ -1572,12 +1573,12 @@ def fftn_c2c(x, s, axes, norm, forward, name):

if s is not None:
x = _resize_fft_input(x, s, axes)
op_type = 'fft_c2c'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)

if in_dygraph_mode():
out = _C_ops.fft_c2c(x, axes, norm, forward)
else:
op_type = 'fft_c2c'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)
inputs = {
'X': [x],
}
Expand Down Expand Up @@ -1623,12 +1624,13 @@ def fftn_r2c(x, s, axes, norm, forward, onesided, name):
if s is not None:
x = _resize_fft_input(x, s, axes)

op_type = 'fft_r2c'
check_variable_and_dtype(x, 'x', ['float16', 'float32', 'float64'], op_type)

if in_dygraph_mode():
out = _C_ops.fft_r2c(x, axes, norm, forward, onesided)
else:
op_type = 'fft_r2c'
check_variable_and_dtype(
x, 'x', ['float16', 'float32', 'float64'], op_type
)
inputs = {
'X': [x],
}
Expand Down Expand Up @@ -1686,15 +1688,14 @@ def fftn_c2r(x, s, axes, norm, forward, name):
fft_input_shape[-1] = fft_input_shape[-1] // 2 + 1
x = _resize_fft_input(x, fft_input_shape, axes)

op_type = 'fft_c2r'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)

if in_dygraph_mode():
if s is not None:
out = _C_ops.fft_c2r(x, axes, norm, forward, s[-1])
else:
out = _C_ops.fft_c2r(x, axes, norm, forward, 0)
else:
op_type = 'fft_c2r'
check_variable_and_dtype(x, 'x', ['complex64', 'complex128'], op_type)
inputs = {
'X': [x],
}
Expand Down
20 changes: 10 additions & 10 deletions python/paddle/fluid/layers/tensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,16 +530,6 @@ def fill_constant(shape, dtype, value, force_cpu=False, out=None, name=None):
data5 = fluid.layers.fill_constant(shape=[2,1], value=val, dtype='float32') #data5=[[2.0],[2.0]]
"""

attrs = {'force_cpu': force_cpu}
dtype = convert_dtype(dtype)
if not isinstance(value, Variable):
if dtype in ['uint8', 'int16', 'int32', 'int64']:
attrs['str_value'] = str(int(value))
attrs['value'] = int(value)
else:
attrs['str_value'] = str(float(value))
attrs['value'] = float(value)

if in_dygraph_mode():
place = _current_expected_place()
if force_cpu:
Expand All @@ -561,6 +551,16 @@ def fill_constant(shape, dtype, value, force_cpu=False, out=None, name=None):
out.stop_gradient = True
return out
else:
attrs = {'force_cpu': force_cpu}
dtype = convert_dtype(dtype)
if not isinstance(value, Variable):
if dtype in ['uint8', 'int16', 'int32', 'int64']:
attrs['str_value'] = str(int(value))
attrs['value'] = int(value)
else:
attrs['str_value'] = str(float(value))
attrs['value'] = float(value)

helper = LayerHelper("fill_constant", **locals())
inputs = {}
if isinstance(value, Variable):
Expand Down
19 changes: 9 additions & 10 deletions python/paddle/tensor/creation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,8 +1026,8 @@ def _check_attr(attr, message):
_check_attr(num_rows, "num_rows")

if dtype is None:
dtype = 'float32'
if not isinstance(dtype, core.VarDesc.VarType):
dtype = core.VarDesc.VarType.FP32
elif not isinstance(dtype, core.VarDesc.VarType):
dtype = convert_np_dtype_to_dtype_(dtype)
if num_columns is not None:
_check_attr(num_columns, "num_columns")
Expand Down Expand Up @@ -1181,14 +1181,6 @@ def arange(start=0, end=None, step=1, dtype=None, name=None):
end = start
start = 0

out_shape = None
if (
not isinstance(start, Variable)
and not isinstance(end, Variable)
and not isinstance(step, Variable)
):
out_shape = [int(math.ceil((end - start) / step))]

if not isinstance(dtype, core.VarDesc.VarType):
dtype = convert_np_dtype_to_dtype_(dtype)

Expand Down Expand Up @@ -1220,6 +1212,13 @@ def arange(start=0, end=None, step=1, dtype=None, name=None):
'range/arange',
)
helper = LayerHelper('range', **locals())
out_shape = None
if (
not isinstance(start, Variable)
and not isinstance(end, Variable)
and not isinstance(step, Variable)
):
out_shape = [int(math.ceil((end - start) / step))]
out = helper.create_variable_for_type_inference(dtype, shape=out_shape)
helper.append_op(
type='range',
Expand Down