use utils:{min,max}_override in {min,max}imum ops

Summary: Noticed this inconsistency with clamp.

Reviewed By: manuelcandales

Differential Revision: D56846313

Author: swolchok

kernels/portable/cpu/op_maximum.cpp

@@ -8,18 +8,14 @@
 
 #include <executorch/kernels/portable/cpu/scalar_utils.h>
 #include <executorch/kernels/portable/cpu/util/broadcast_util.h>
+#include <executorch/kernels/portable/cpu/util/math_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
 namespace torch {
 namespace executor {
 namespace native {
 namespace {
 
-template <class T>
-const T& max(const T& a, const T& b) {
-  return (b > a) ? b : a;
-}
-
 template <
     bool can_cast,
     typename CTYPE_A,
@@ -40,7 +36,7 @@ struct MaximumInner<true, CTYPE_A, CTYPE_B, CTYPE_IN, CTYPE_OUT> {
         [](const CTYPE_A val_a, const CTYPE_B val_b) {
           CTYPE_IN a_casted = static_cast<CTYPE_IN>(val_a);
           CTYPE_IN b_casted = static_cast<CTYPE_IN>(val_b);
-          CTYPE_IN value = max(a_casted, b_casted);
+          CTYPE_IN value = utils::max_override(a_casted, b_casted);
 
           return static_cast<CTYPE_OUT>(value);
         },

kernels/portable/cpu/op_minimum.cpp

@@ -8,18 +8,14 @@
 
 #include <executorch/kernels/portable/cpu/scalar_utils.h>
 #include <executorch/kernels/portable/cpu/util/broadcast_util.h>
+#include <executorch/kernels/portable/cpu/util/math_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
 namespace torch {
 namespace executor {
 namespace native {
 namespace {
 
-template <class T>
-const T& min(const T& a, const T& b) {
-  return (b < a) ? b : a;
-}
-
 template <
     bool can_cast,
     typename CTYPE_A,
@@ -40,7 +36,7 @@ struct MinimumInner<true, CTYPE_A, CTYPE_B, CTYPE_IN, CTYPE_OUT> {
         [](const CTYPE_A val_a, const CTYPE_B val_b) {
           CTYPE_IN a_casted = static_cast<CTYPE_IN>(val_a);
           CTYPE_IN b_casted = static_cast<CTYPE_IN>(val_b);
-          CTYPE_IN value = min(a_casted, b_casted);
+          CTYPE_IN value = utils::min_override(a_casted, b_casted);
 
           return static_cast<CTYPE_OUT>(value);
         },

kernels/portable/cpu/targets.bzl

@@ -565,6 +565,7 @@ _ATEN_OPS = (
         name = "op_maximum",
         deps = [
             "//executorch/kernels/portable/cpu/util:broadcast_util",
+            "//executorch/kernels/portable/cpu/util:math_util",
             ":scalar_utils",
         ],
     ),
@@ -596,6 +597,7 @@ _ATEN_OPS = (
         name = "op_minimum",
         deps = [
             "//executorch/kernels/portable/cpu/util:broadcast_util",
+            "//executorch/kernels/portable/cpu/util:math_util",
             ":scalar_utils",
         ],
     ),