【Paddle Tensor 第二期 API鲁棒性增强】合并min、max functors的int类型模板 (#70121)

aquagull · web-flow · commit dee3c68757db · 2024-12-13T10:48:11.000+08:00
* fine

* fix

* reback

* fine

* fix

* fix code

* fix

* fix
diff --git a/paddle/phi/kernels/primitive/functor_primitives.h b/paddle/phi/kernels/primitive/functor_primitives.h
@@ -154,7 +154,9 @@ struct MinFunctor {
   inline T initial() { return static_cast<T>(std::numeric_limits<T>::max()); }
 
   __device__ __forceinline__ T operator()(const T a, const T b) const {
-    if (std::is_floating_point<T>::value) {
+    if constexpr ((std::is_floating_point<T>::value) &&
+                  (!(std::is_same<T, int32_t>::value ||
+                     (std::is_same<T, int64_t>::value)))) {
       if (isnan(a)) {
         return a;
       }
@@ -166,38 +168,13 @@ struct MinFunctor {
   }
 };
 
-/**
- * @brief Int32_t binary min functor
- */
-template <>
-struct MinFunctor<int32_t> {
-  inline int32_t initial() { return std::numeric_limits<int32_t>::max(); }
-
-  __device__ int32_t operator()(const int32_t a, const int32_t b) const {
-    return (b < a) ? b : a;
-  }
-};
-
-/**
- * @brief Int64_t binary min functor
- */
-template <>
-struct MinFunctor<int64_t> {
-  inline int64_t initial() { return std::numeric_limits<int64_t>::max(); }
-
-  __device__ int64_t operator()(const int64_t a, const int64_t b) const {
-    return (b < a) ? b : a;
-  }
-};
-
-/**
- * @brief Bool binary min functor
- */
 template <>
 struct MinFunctor<bool> {
   inline bool initial() { return false; }
 
-  __device__ bool operator()(const bool a, const bool b) const { return a & b; }
+  __device__ __forceinline__ bool operator()(const bool a, const bool b) const {
+    return a & b;
+  }
 };
 
 /**
@@ -210,7 +187,9 @@ struct MaxFunctor {
   }
 
   __device__ __forceinline__ T operator()(const T a, const T b) const {
-    if (std::is_floating_point<T>::value) {
+    if constexpr ((std::is_floating_point<T>::value) &&
+                  (!(std::is_same<T, int32_t>::value ||
+                     (std::is_same<T, int64_t>::value)))) {
       if (isnan(a)) {
         return a;
       }
@@ -222,38 +201,13 @@ struct MaxFunctor {
   }
 };
 
-/**
- * @brief Int32_t binary max functor
- */
-template <>
-struct MaxFunctor<int32_t> {
-  inline int32_t initial() { return std::numeric_limits<int32_t>::lowest(); }
-
-  __device__ int32_t operator()(const int32_t a, const int32_t b) const {
-    return (b > a) ? b : a;
-  }
-};
-
-/**
- * @brief Int64_t binary max functor
- */
-template <>
-struct MaxFunctor<int64_t> {
-  inline int64_t initial() { return std::numeric_limits<int64_t>::lowest(); }
-
-  __device__ int64_t operator()(const int64_t a, const int64_t b) const {
-    return (b > a) ? b : a;
-  }
-};
-
-/**
- * @brief Bool binary max functor
- */
 template <>
 struct MaxFunctor<bool> {
   inline bool initial() { return true; }
 
-  __device__ bool operator()(const bool a, const bool b) const { return a | b; }
+  __device__ __forceinline__ bool operator()(const bool a, const bool b) const {
+    return a | b;
+  }
 };
 
 /**
