[Phi] Migrate fmax,fmin kernel to phi #40140

cxxly · 2022-03-03T12:36:00Z

PR types

Function optimization

PR changes

OPs

Describe

Migrate fmax and fmin kernel.

paddle-bot-old · 2022-03-03T12:36:32Z

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

MingMingShangTian · 2022-03-04T09:11:05Z

paddle/phi/kernels/impl/elementwise_max_kernel_impl.h

+
+#pragma once
+
+#include "paddle/fluid/platform/place.h"


这个头文件有用到吗？

MingMingShangTian · 2022-03-04T09:12:51Z

paddle/phi/kernels/impl/elementwise_min_kernel_impl.h

+
+#pragma once
+
+#include "paddle/fluid/platform/place.h"


YuanRisheng

phi下对elementwise算子进行了归并，需要将代码移动到现在已有的文件中，详情参考elementwise_add/sub/mul/div

YuanRisheng · 2022-03-04T09:23:06Z

paddle/phi/kernels/cpu/elementwise_max_grad_kernel.cc

@@ -0,0 +1,26 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


文件合并到elementwise_grad_kernel.cc中吧，这个里边都是放着elementwise相关kernel

YuanRisheng · 2022-03-04T09:23:58Z

paddle/phi/kernels/cpu/elementwise_max_kernel.cc

@@ -0,0 +1,26 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


改名为elementwise_kernel.cc，全部存放elementwise相关kernel

YuanRisheng · 2022-03-04T09:24:11Z

paddle/phi/kernels/cpu/elementwise_min_grad_kernel.cc

@@ -0,0 +1,26 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


同上，反向的elementwise kernel全部放置在elementwise_grad_kernel.cc（cu）中

YuanRisheng · 2022-03-04T09:25:16Z

paddle/phi/kernels/elementwise_max_grad_kernel.h

@@ -0,0 +1,30 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


放到elementwise_grad_kernel.h中

YuanRisheng · 2022-03-04T09:25:42Z

paddle/phi/kernels/elementwise_max_kernel.h

@@ -0,0 +1,29 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


改名为elementwise_kernel.h吧，专门放elementwise的kernel

YuanRisheng · 2022-03-04T09:27:57Z

paddle/phi/kernels/impl/elementwise_max_grad_kernel_impl.h

@@ -0,0 +1,137 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


和并到elementwise_grad_kernel_impl.h中

YuanRisheng · 2022-03-04T09:29:29Z

paddle/fluid/operators/elementwise/elementwise_functor.h

@@ -151,86 +151,6 @@ struct DivGradYFunctor<Complex<T>> {
  }
 };

-// Fmax
-template <typename T>
-struct FMaxFunctor {


这个文件移除掉的functor，放置在phi/kernels/funcs/elementwise_functor.h下

YuanRisheng · 2022-03-04T09:30:28Z

paddle/phi/ops/compat/elementwise_max_sig.cc

@@ -0,0 +1,28 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


合入到elementwise_sig.cc中

zyfncg · 2022-03-04T09:48:33Z

paddle/phi/kernels/cpu/elementwise_max_grad_kernel.cc

+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+


include对应头文件

zyfncg · 2022-03-04T09:48:41Z

paddle/phi/kernels/cpu/elementwise_max_kernel.cc

+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+


zyfncg · 2022-03-04T09:52:40Z

paddle/phi/kernels/impl/elementwise_max_grad_kernel_impl.h

+                                       dtype::float16 out,
+                                       dtype::float16 dout) const {
+    return dout *
+           static_cast<dtype::float16>((x >= y) || paddle::platform::isnan(y));


paddle::platform:: -> phi::dtype?

zyfncg · 2022-03-04T09:56:24Z

paddle/phi/kernels/impl/elementwise_max_grad_kernel_impl.h

+                                       dtype::float16 out,
+                                       dtype::float16 dout) const {
+    return dout * static_cast<dtype::float16>(
+                      !((x >= y) || paddle::platform::isnan(y)));


zyfncg · 2022-03-04T09:58:09Z

paddle/phi/kernels/impl/elementwise_max_kernel_impl.h

+
+#pragma once
+
+#include "paddle/fluid/platform/place.h"


place.h可以去掉吗？

zyfncg · 2022-03-04T09:58:33Z

paddle/phi/kernels/impl/elementwise_min_kernel_impl.h

+
+#pragma once
+
+#include "paddle/fluid/platform/place.h"


MingMingShangTian

LGTM

zyfncg · 2022-03-14T06:40:52Z

paddle/fluid/operators/elementwise/elementwise_functor.h

-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
    http://www.apache.org/licenses/LICENSE-2.0
-


这里几处空行不需要删，可以参考其他文件内的License

好的，会在下一个PR修改

cxxly changed the title ~~[phi]migrate fmax,fmin kernel to phi~~ [Phi] Migrate fmax,fmin kernel to phi Mar 3, 2022

MingMingShangTian reviewed Mar 4, 2022

View reviewed changes

YuanRisheng reviewed Mar 4, 2022

View reviewed changes

zyfncg reviewed Mar 4, 2022

View reviewed changes

cxxly force-pushed the phi-migration branch from 08d9145 to 54c8190 Compare March 6, 2022 07:38

cxxly force-pushed the phi-migration branch from 54c8190 to 20c80b8 Compare March 7, 2022 04:15

cxxly force-pushed the phi-migration branch 2 times, most recently from 55068b4 to df23c67 Compare March 7, 2022 07:19

cxxly force-pushed the phi-migration branch from df23c67 to ea4a253 Compare March 7, 2022 08:34

cxxly force-pushed the phi-migration branch from ea4a253 to 81080da Compare March 8, 2022 02:08

cxxly force-pushed the phi-migration branch from 81080da to 9cb4f53 Compare March 10, 2022 07:19

[phi]migrate fmax,fmin kernel to phi

7fcfb98

cxxly force-pushed the phi-migration branch from 9cb4f53 to 7fcfb98 Compare March 10, 2022 10:54

MingMingShangTian approved these changes Mar 14, 2022

View reviewed changes

zyfncg approved these changes Mar 14, 2022

View reviewed changes

YuanRisheng approved these changes Mar 14, 2022

View reviewed changes

iclementine merged commit bb80196 into PaddlePaddle:develop Mar 14, 2022

		@@ -0,0 +1,26 @@
		// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

		@@ -0,0 +1,30 @@
		// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

		@@ -0,0 +1,29 @@
		// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

		@@ -0,0 +1,137 @@
		// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

		@@ -0,0 +1,28 @@
		// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


		#pragma once

		#include "paddle/fluid/platform/place.h"


		#pragma once

		#include "paddle/fluid/platform/place.h"


		#pragma once

		#include "paddle/fluid/platform/place.h"


		#pragma once

		#include "paddle/fluid/platform/place.h"

[Phi] Migrate fmax,fmin kernel to phi #40140

[Phi] Migrate fmax,fmin kernel to phi #40140

Conversation

cxxly commented Mar 3, 2022

PR types

PR changes

Describe

paddle-bot-old bot commented Mar 3, 2022

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

YuanRisheng left a comment • 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

YuanRisheng Mar 4, 2022 • 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

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

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

MingMingShangTian left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

YuanRisheng left a comment •

edited

Loading

YuanRisheng Mar 4, 2022 •

edited

Loading