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

[Clean fluid] Add inner function _elementwise_op_with_axis #48748

Merged
merged 18 commits into from
Dec 12, 2022
Merged

[Clean fluid] Add inner function _elementwise_op_with_axis #48748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3f41133
add inner function _elementwise_op_with_axis
jiahy0825 Dec 5, 2022
5191ea6
fix transformer_model
jiahy0825 Dec 6, 2022
82caea9
polish API code
jiahy0825 Dec 6, 2022
c36c15d
remove elementwise_div/mul api
jiahy0825 Dec 7, 2022
1fd1ed4
delete API in __all__
jiahy0825 Dec 7, 2022
ee3599c
delete elementwise_mul completely
jiahy0825 Dec 7, 2022
e9922be
polish elementwise_mul call
jiahy0825 Dec 7, 2022
c48d60c
polish internal api
jiahy0825 Dec 7, 2022
d0f9765
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiahy0825 Dec 7, 2022
c432583
resolve conflict, fix rnn.py
jiahy0825 Dec 7, 2022
c92dc9e
use non-inplace call
jiahy0825 Dec 7, 2022
9b82b49
delete elementwise_mul api test
jiahy0825 Dec 8, 2022
43242f5
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiahy0825 Dec 8, 2022
a3727d5
delete elementwise_mul api test
jiahy0825 Dec 8, 2022
38b72d7
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiahy0825 Dec 9, 2022
112dfb8
clean elementwise_add/sub
jiahy0825 Dec 9, 2022
fdd033b
restore _elementwise_op_in_dygraph in nn.py
jiahy0825 Dec 9, 2022
f11a0e0
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiahy0825 Dec 9, 2022
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
12 changes: 6 additions & 6 deletions python/paddle/fluid/contrib/layers/rnn_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ def get_single_direction_output(
new_hidden = unit_list[i](step_input, pre_hidden)

if mask:
new_hidden = layers.elementwise_mul(
new_hidden = paddle.tensor.math._multiply_with_axis(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里需要使用内部接口的原因是什么？paddle.multiply是否能满足需求？

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paddle.add/subtract/multiply/divide 这几个 API 没有 axis 参数，然而需要清理的 elementwise.add/sub/mul/div API 有 axis 参数并且在多个地方都使用了这个参数，因此需要封装一个内部接口，专门用来处理带有 axis 参数的四则运算
（注：对于没有用到 axis 参数的 elementwise API，先前已经尽可能用 paddle.add/subtract/multiply/divide 来代替了）

paddle.add/subtract/multiply/divide API doesn't have the parameter axis. However, elementwise.add/sub/mul/div API has axis and the corresponding API is called in several places. Therefore, it is necessary to encapsulate an internal interface, which is specially used to deal with arithmetic operations with axis parameters.

new_hidden, step_mask, axis=0
) - layers.elementwise_mul(
) - paddle.tensor.math._multiply_with_axis(
pre_hidden, (step_mask - 1), axis=0
)
rnn.update_memory(pre_hidden, new_hidden)
Expand Down Expand Up @@ -661,14 +661,14 @@ def get_single_direction_output(
)

if mask:
new_hidden = layers.elementwise_mul(
new_hidden = paddle.tensor.math._multiply_with_axis(
new_hidden, step_mask, axis=0
) - layers.elementwise_mul(
) - paddle.tensor.math._multiply_with_axis(
pre_hidden, (step_mask - 1), axis=0
)
new_cell = layers.elementwise_mul(
new_cell = paddle.tensor.math._multiply_with_axis(
new_cell, step_mask, axis=0
) - layers.elementwise_mul(
) - paddle.tensor.math._multiply_with_axis(
pre_cell, (step_mask - 1), axis=0
)

Expand Down
4 changes: 1 addition & 3 deletions python/paddle/fluid/layer_helper_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ def to_variable(self, value, name=None):
)

def _create_weight_normalize(self, attr, shape, dtype):
from .layers import elementwise_mul

# Remove these ops when LayerHelper and layers support indicating
# program and block.
def __norm_op(
Expand Down Expand Up @@ -272,7 +270,7 @@ def __weight_normalize(g, v, dim):
# Currently, elementwise_mul only support broadcast when the shape
# of y is a subset of the shape of x. Thus, we reshape y to squeeze
# to achieve the subset.
w = elementwise_mul(
w = paddle.tensor.math._multiply_with_axis(
x=v,
y=scale
if dim is None
Expand Down
Loading