Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
TonyTonyFun
Paddle
提交
fe2bfe15
P
Paddle
项目概览
TonyTonyFun
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fe2bfe15
编写于
8月 31, 2022
作者:
六
六个骨头
提交者:
GitHub
8月 31, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【PaddlePaddle Hackathon 3 No.14】为 Paddle 新增 remainder_ API (#45266)
上级
236ac0d0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
90 addition
and
3 deletion
+90
-3
paddle/fluid/operators/elementwise/elementwise_mod_op.cc
paddle/fluid/operators/elementwise/elementwise_mod_op.cc
+2
-1
python/paddle/__init__.py
python/paddle/__init__.py
+1
-0
python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
...n/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
+44
-2
python/paddle/fluid/tests/unittests/test_inplace.py
python/paddle/fluid/tests/unittests/test_inplace.py
+23
-0
python/paddle/tensor/__init__.py
python/paddle/tensor/__init__.py
+2
-0
python/paddle/tensor/math.py
python/paddle/tensor/math.py
+18
-0
未找到文件。
paddle/fluid/operators/elementwise/elementwise_mod_op.cc
浏览文件 @
fe2bfe15
...
...
@@ -56,7 +56,8 @@ class ElementwiseModOpMaker : public ElementwiseOpMaker {
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_WITHOUT_GRADIENT
(
elementwise_mod
,
ops
::
ElementwiseOp
,
ops
::
ElementwiseModOpMaker
);
ops
::
ElementwiseModOpMaker
,
ops
::
ElementwiseOpInplaceInferer
);
REGISTER_OP_VERSION
(
elementwise_mod
)
.
AddCheckpoint
(
...
...
python/paddle/__init__.py
浏览文件 @
fe2bfe15
...
...
@@ -239,6 +239,7 @@ from .tensor.math import mm # noqa: F401
from
.tensor.math
import
divide
# noqa: F401
from
.tensor.math
import
floor_divide
# noqa: F401
from
.tensor.math
import
remainder
# noqa: F401
from
.tensor.math
import
remainder_
# noqa: F401
from
.tensor.math
import
mod
# noqa: F401
from
.tensor.math
import
floor_mod
# noqa: F401
from
.tensor.math
import
multiply
# noqa: F401
...
...
python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
浏览文件 @
fe2bfe15
...
...
@@ -97,12 +97,15 @@ class TestElementwiseModOpDouble(TestElementwiseModOpFloat):
class
TestRemainderOp
(
unittest
.
TestCase
):
def
_executed_api
(
self
,
x
,
y
,
name
=
None
):
return
paddle
.
remainder
(
x
,
y
,
name
)
def
test_name
(
self
):
with
fluid
.
program_guard
(
fluid
.
Program
()):
x
=
fluid
.
data
(
name
=
"x"
,
shape
=
[
2
,
3
],
dtype
=
"int64"
)
y
=
fluid
.
data
(
name
=
'y'
,
shape
=
[
2
,
3
],
dtype
=
'int64'
)
y_1
=
paddle
.
remainder
(
x
,
y
,
name
=
'div_res'
)
y_1
=
self
.
_executed_api
(
x
,
y
,
name
=
'div_res'
)
self
.
assertEqual
((
'div_res'
in
y_1
.
name
),
True
)
def
test_dygraph
(
self
):
...
...
@@ -111,7 +114,7 @@ class TestRemainderOp(unittest.TestCase):
np_y
=
np
.
array
([
1
,
5
,
3
,
3
]).
astype
(
'int64'
)
x
=
paddle
.
to_tensor
(
np_x
)
y
=
paddle
.
to_tensor
(
np_y
)
z
=
paddle
.
remainder
(
x
,
y
)
z
=
self
.
_executed_api
(
x
,
y
)
np_z
=
z
.
numpy
()
z_expected
=
np
.
array
([
0
,
3
,
2
,
1
])
self
.
assertEqual
((
np_z
==
z_expected
).
all
(),
True
)
...
...
@@ -133,5 +136,44 @@ class TestRemainderOp(unittest.TestCase):
np
.
testing
.
assert_allclose
(
z_expected
,
z
.
numpy
(),
rtol
=
1e-05
)
class
TestRemainderInplaceOp
(
TestRemainderOp
):
def
_executed_api
(
self
,
x
,
y
,
name
=
None
):
return
x
.
remainder_
(
y
,
name
)
class
TestRemainderInplaceBroadcastSuccess
(
unittest
.
TestCase
):
def
init_data
(
self
):
self
.
x_numpy
=
np
.
random
.
rand
(
2
,
3
,
4
).
astype
(
'float'
)
self
.
y_numpy
=
np
.
random
.
rand
(
3
,
4
).
astype
(
'float'
)
def
test_broadcast_success
(
self
):
paddle
.
disable_static
()
self
.
init_data
()
x
=
paddle
.
to_tensor
(
self
.
x_numpy
)
y
=
paddle
.
to_tensor
(
self
.
y_numpy
)
inplace_result
=
x
.
remainder_
(
y
)
numpy_result
=
self
.
x_numpy
%
self
.
y_numpy
self
.
assertEqual
((
inplace_result
.
numpy
()
==
numpy_result
).
all
(),
True
)
paddle
.
enable_static
()
class
TestRemainderInplaceBroadcastSuccess2
(
TestRemainderInplaceBroadcastSuccess
):
def
init_data
(
self
):
self
.
x_numpy
=
np
.
random
.
rand
(
1
,
2
,
3
,
1
).
astype
(
'float'
)
self
.
y_numpy
=
np
.
random
.
rand
(
3
,
1
).
astype
(
'float'
)
class
TestRemainderInplaceBroadcastSuccess3
(
TestRemainderInplaceBroadcastSuccess
):
def
init_data
(
self
):
self
.
x_numpy
=
np
.
random
.
rand
(
2
,
3
,
1
,
5
).
astype
(
'float'
)
self
.
y_numpy
=
np
.
random
.
rand
(
1
,
3
,
1
,
5
).
astype
(
'float'
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/test_inplace.py
浏览文件 @
fe2bfe15
...
...
@@ -494,6 +494,29 @@ class TestDygraphInplaceSubtract(TestDygraphInplaceAdd):
return
var
.
subtract_
(
input_var_2
)
class
TestDygraphInplaceRemainder
(
TestDygraphInplaceAdd
):
def
non_inplace_api_processing
(
self
,
var
):
input_var_2
=
paddle
.
to_tensor
(
self
.
input_var_numpy_2
)
return
var
.
remainder
(
input_var_2
)
def
inplace_api_processing
(
self
,
var
):
input_var_2
=
paddle
.
to_tensor
(
self
.
input_var_numpy_2
)
return
var
.
remainder_
(
input_var_2
)
def
test_leaf_inplace_var_error
(
self
):
pass
def
test_backward_error
(
self
):
pass
def
test_backward_success_1
(
self
):
pass
def
test_backward_success_2
(
self
):
pass
class
TestLossIsInplaceVar
(
unittest
.
TestCase
):
def
func_test_loss_is_inplace_var
(
self
):
...
...
python/paddle/tensor/__init__.py
浏览文件 @
fe2bfe15
...
...
@@ -184,6 +184,7 @@ from .math import mm # noqa: F401
from
.math
import
divide
# noqa: F401
from
.math
import
floor_divide
# noqa: F401
from
.math
import
remainder
# noqa: F401
from
.math
import
remainder_
# noqa: F401
from
.math
import
mod
# noqa: F401
from
.math
import
floor_mod
# noqa: F401
from
.math
import
multiply
# noqa: F401
...
...
@@ -367,6 +368,7 @@ tensor_method_func = [ # noqa
'divide'
,
'floor_divide'
,
'remainder'
,
'remainder_'
,
'mod'
,
'floor_mod'
,
'multiply'
,
...
...
python/paddle/tensor/math.py
浏览文件 @
fe2bfe15
...
...
@@ -784,6 +784,24 @@ def remainder(x, y, name=None):
return
_elementwise_op
(
LayerHelper
(
op_type
,
**
locals
()))
@
inplace_apis_in_dygraph_only
def
remainder_
(
x
,
y
,
name
=
None
):
r
"""
Inplace version of ``remainder`` API, the output Tensor will be inplaced with input ``x``.
Please refer to :ref:`api_tensor_remainder`.
"""
op_type
=
'elementwise_mod_'
axis
=
-
1
out_shape
=
broadcast_shape
(
x
.
shape
,
y
.
shape
)
if
out_shape
!=
x
.
shape
:
raise
ValueError
(
"The shape of broadcast output {} is different from that of inplace tensor {} in the Inplace operation."
.
format
(
out_shape
,
x
.
shape
))
return
_elementwise_op_in_dygraph
(
x
,
y
,
axis
=
axis
,
op_name
=
op_type
)
mod
=
remainder
# noqa: F841
floor_mod
=
remainder
# noqa: F841
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录