Added fmax and fmin operators #37826

lijiaqi0612 · 2021-12-03T06:38:05Z

PR types

New features

PR changes

OPs

Describe

Added fmax and fmin operators, and added documentation and unit tests for comparison with competing products.

example:

import numpy as np
import paddle

x = paddle.to_tensor([2, 3, np.nan], dtype='float32')
y = paddle.to_tensor([1, np.nan, 5], dtype='float32')

# fmax
res_fmax = paddle.fmax(x, y)
print(res_fmax)
#    [ 2., 3., 5.]
 
# fmin
res_fmin = paddle.fmin(x, y)
print(res_fmin)
#    [ 1., 3., 5.]

The reason for the need to modify the 'no_grad_set_white_list.py' file is that because there are two inputs, the reverse of one of them needs to be tested separately, and the operator name needs to be added to the whitelist.

paddle-bot-old · 2021-12-03T06:38:18Z

✅ This PR's description meets the template requirements!
Please wait for other CI results.

paddle-bot-old · 2021-12-03T06:38:20Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

iclementine · 2021-12-03T07:28:38Z

paddle/fluid/operators/elementwise/elementwise_max_op.cc

+    ops::ElementwiseFMaxGradKernel<paddle::platform::CPUDeviceContext, int>,
+    ops::ElementwiseFMaxGradKernel<paddle::platform::CPUDeviceContext, int64_t>);
+
+REGISTER_OP_VERSION(elementwise_fmax)


这一段不需要，这是用于 op 兼容性升级的。

iclementine · 2021-12-03T07:38:17Z

python/paddle/tensor/math.py

+    The equation is:
+
+    .. math::
+        out = fmax(x, y)


文档里面最好写明 nan 的传播机制。亦即 nan 被认为小于任何值。

iclementine · 2021-12-03T07:38:30Z

python/paddle/tensor/math.py

+        out = fmin(x, y)
+
+    **Note**:
+    ``paddle.fmin`` supports broadcasting. If you want know more about broadcasting, please refer to :ref:`user_guide_broadcasting` .


文档里面最好写明 nan 的传播机制。亦即 nan 被认为大于任何值。

OK 已经添加了

paddle/fluid/operators/elementwise/elementwise_max_op.cu

iclementine · 2021-12-03T07:44:29Z

python/paddle/fluid/tests/unittests/test_fmax_op.py

+import paddle.fluid.core as core
+
+
+class ApiFMaxTest(unittest.TestCase):


还缺少 OpTest。
需要继承 OpTest 写 Op 单元测试。可以参考 python/paddle/fluid/tests/unittests/test_elementwise_add_op.py

fmin 也是一样

ok 已经添加了

dingjiaweiww · 2021-12-10T09:23:04Z

python/paddle/tensor/__init__.py

@@ -295,6 +297,8 @@
           'maximum',
           'min',
           'minimum',
+           'fmax',
+           'fmin',


这里需要把函数加入此文件的tensor_method_func列表

dingjiaweiww · 2021-12-10T09:24:12Z

python/paddle/__init__.py

@@ -437,6 +439,8 @@
           'pow',
           'zeros_like',
           'maximum',
+           'fmax',
+           'fmin',


需要加入此文件的all 列表

已经加了呀

jeff41404 · 2021-12-10T10:16:00Z

paddle/fluid/operators/elementwise/elementwise_max_op.cc

+    return "Compare two tensors and returns a new tensor containing the "
+           "element-wise maxima.";


what's different between fmax and max, shall we describe it more detailed？

jeff41404 · 2021-12-10T10:32:19Z

paddle/fluid/operators/elementwise/elementwise_min_op.cc

+    return "Compare two tensors and returns a new tensor containing the "
+           "element-wise minima.";


what's different between fmin and min, shall we describe it more detailed？

jeff41404

lgtm

Shixiaowei02

approve for no_grad_set_white_list

iclementine

LGTM

lijiaqi0612 added 2 commits December 3, 2021 03:31

add fmax and fmin oper

f17ce98

add fmax and fmin second

0bc570c

Resolve conflicts

cc6b490

lijiaqi0612 changed the title ~~Fmax fmin~~ Added fmax and fmin operators Dec 3, 2021

Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fmax_fmin

cf195bd

iclementine reviewed Dec 3, 2021

View reviewed changes

paddle/fluid/operators/elementwise/elementwise_max_op.cu Show resolved Hide resolved

iclementine reviewed Dec 3, 2021

View reviewed changes

lijiaqi0612 added 8 commits December 6, 2021 08:16

add fp16 type to fmax and fmin

5cf5553

fix bug

3fff0fa

fix bugs

882dce8

fix bugs second

3869a11

fix bugs third

20e801f

fix bugs four- temple specily

0b06118

fix bugs fiveth-temple specily

165dffa

Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fmax_fmin

ae320ff

dingjiaweiww reviewed Dec 10, 2021

View reviewed changes

dingjiaweiww previously approved these changes Dec 10, 2021

View reviewed changes

jeff41404 reviewed Dec 10, 2021

View reviewed changes

describe opmaker comments more detailed

91587cf

lijiaqi0612 dismissed dingjiaweiww’s stale review via 91587cf December 10, 2021 12:19

lijiaqi0612 added 2 commits December 13, 2021 02:44

Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fmax_fmin

bad2e10

nothing

f21bbff

jeff41404 previously approved these changes Dec 14, 2021

View reviewed changes

lanxianghit previously approved these changes Dec 15, 2021

View reviewed changes

Shixiaowei02 previously approved these changes Dec 15, 2021

View reviewed changes

Merge branch 'develop' into fmax_fmin

44c221a

lijiaqi0612 dismissed stale reviews from Shixiaowei02, lanxianghit, and jeff41404 via 44c221a December 15, 2021 03:20

lanxianghit approved these changes Dec 15, 2021

View reviewed changes

Shixiaowei02 approved these changes Dec 15, 2021

View reviewed changes

dingjiaweiww approved these changes Dec 15, 2021

View reviewed changes

jeff41404 approved these changes Dec 16, 2021

View reviewed changes

iclementine approved these changes Dec 16, 2021

View reviewed changes

iclementine merged commit dd3afc9 into PaddlePaddle:develop Dec 16, 2021

lidanqing-intel mentioned this pull request Jan 21, 2022

Fix isnan compiling error #39106

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added fmax and fmin operators #37826

Added fmax and fmin operators #37826

lijiaqi0612 commented Dec 3, 2021 •

edited

Loading

paddle-bot-old bot commented Dec 3, 2021 •

edited

Loading

paddle-bot-old bot commented Dec 3, 2021

iclementine Dec 3, 2021

iclementine Dec 3, 2021

iclementine Dec 3, 2021

lijiaqi0612 Dec 6, 2021

lijiaqi0612 Dec 6, 2021

iclementine Dec 3, 2021 •

edited

Loading

lijiaqi0612 Dec 6, 2021

dingjiaweiww Dec 10, 2021

dingjiaweiww Dec 10, 2021

lijiaqi0612 Dec 10, 2021

jeff41404 Dec 10, 2021

jeff41404 Dec 10, 2021

lijiaqi0612 Dec 10, 2021

jeff41404 left a comment

Shixiaowei02 left a comment

iclementine left a comment

		import paddle.fluid.core as core


		class ApiFMaxTest(unittest.TestCase):

		return "Compare two tensors and returns a new tensor containing the "
		"element-wise maxima.";

		return "Compare two tensors and returns a new tensor containing the "
		"element-wise minima.";

Added fmax and fmin operators #37826

Added fmax and fmin operators #37826

Conversation

lijiaqi0612 commented Dec 3, 2021 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Dec 3, 2021 • edited Loading

paddle-bot-old bot commented Dec 3, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iclementine Dec 3, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeff41404 left a comment

Choose a reason for hiding this comment

Shixiaowei02 left a comment

Choose a reason for hiding this comment

iclementine left a comment

Choose a reason for hiding this comment

lijiaqi0612 commented Dec 3, 2021 •

edited

Loading

paddle-bot-old bot commented Dec 3, 2021 •

edited

Loading

iclementine Dec 3, 2021 •

edited

Loading