From bebaee37e3978251a4567f7688204df585abc21d Mon Sep 17 00:00:00 2001
From: niuliling123 <51102941+niuliling123@users.noreply.github.com>
Date: Wed, 18 May 2022 14:55:29 +0800
Subject: [PATCH] Add return in initial function (#42823)

---
 .../primitive/functor_primitives_xpu2.h       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/paddle/phi/kernels/primitive/functor_primitives_xpu2.h b/paddle/phi/kernels/primitive/functor_primitives_xpu2.h
index fdcbb5ec9cc..35cea6e6927 100644
--- a/paddle/phi/kernels/primitive/functor_primitives_xpu2.h
+++ b/paddle/phi/kernels/primitive/functor_primitives_xpu2.h
@@ -55,21 +55,21 @@ struct DivideFunctor {
   inline DivideFunctor() { n_inv = static_cast<Tx>(1.0f); }
 
   explicit inline DivideFunctor(int n)
-      : n_inv(static_cast<Tx>(((float)1.0) / (static_cast<float>(n)))) {}
+      : n_inv(static_cast<Tx>(1.0f / (static_cast<float>(n)))) {}
 
   inline Ty operator()(const Tx& x) const { return static_cast<Ty>(x * n_inv); }
 
   __device__ inline DivideFunctor() { n_inv = static_cast<Tx>(1.0f); }
 
   __device__ inline DivideFunctor(int n)
-      : n_inv(static_cast<Tx>(((float)1.0) / (static_cast<float>(n)))) {}
+      : n_inv(static_cast<Tx>(1.0f / (static_cast<float>(n)))) {}
 
   __device__ inline Ty operator()(const Tx& x) const {
     return static_cast<Ty>(x * n_inv);
   }
 
   __device__ inline void SetDiv(int n) {
-    n_inv = static_cast<Tx>(((float)1.0) / (static_cast<float>(n)));
+    n_inv = static_cast<Tx>(1.0f / (static_cast<float>(n)));
   }
 
  private:
@@ -97,8 +97,7 @@ struct SquareFunctor {
  */
 template <typename T>
 struct MinFunctor {
-  inline T initial() { /*return static_cast<T>(std::numeric_limits<T>::max());*/
-  }
+  inline T initial() { return static_cast<T>(std::numeric_limits<T>::max()); }
 
   __device__ T operator()(const T& a, const T& b) const {
     return (b < a) ? b : a;
@@ -111,7 +110,7 @@ struct MinFunctor {
 template <typename T>
 struct MaxFunctor {
   inline T initial() {
-    // return static_cast<T>(std::numeric_limits<T>::lowest());
+    return static_cast<T>(std::numeric_limits<T>::lowest());
   }
 
   __device__ T operator()(const T& a, const T& b) const {
@@ -124,8 +123,7 @@ struct MaxFunctor {
  */
 template <typename T>
 struct AddFunctor {
-  inline T initial() { /*return static_cast<T>(0.0f);*/
-  }
+  inline T initial() { return static_cast<T>(0.0f); }
 
   __device__ T operator()(const T a, const T b) const { return b + a; }
 };
@@ -135,8 +133,7 @@ struct AddFunctor {
  */
 template <typename T>
 struct MulFunctor {
-  inline T initial() { /*return static_cast<T>(1.0f);*/
-  }
+  inline T initial() { return static_cast<T>(1.0f); }
 
   __device__ T operator()(const T& a, const T& b) const { return b * a; }
 };
@@ -146,8 +143,7 @@ struct MulFunctor {
  */
 template <typename T>
 struct LogicalOrFunctor {
-  inline T initial() { /*return static_cast<T>(false);*/
-  }
+  inline T initial() { return static_cast<T>(false); }
 
   __device__ T operator()(const T& a, const T& b) const { return b || a; }
 };
-- 
GitLab