Merge Pull Request #12239 from uliegecsm/Trilinos/stokhos_fmin_fmax

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Stokhos: Add ensemble versions of `fmin` and `max`' PR Author: maartenarnst
trilinos · Sep 12, 2023 · cb70492 · cb70492
2 parents 4c48597 + 9ee7bce
commit cb70492
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/packages/stokhos/src/sacado/kokkos/Stokhos_Sacado_Kokkos_MathFunctions.hpp b/packages/stokhos/src/sacado/kokkos/Stokhos_Sacado_Kokkos_MathFunctions.hpp
@@ -181,6 +181,8 @@ BINARYFUNC_MACRO(atan2, Atan2Op)
 BINARYFUNC_MACRO(pow, PowerOp)
 BINARYFUNC_MACRO(max, MaxOp)
 BINARYFUNC_MACRO(min, MinOp)
+BINARYFUNC_MACRO(fmax, FMaxOp)
+BINARYFUNC_MACRO(fmin, FMinOp)
 
 #undef BINARYFUNC_MACRO
 #undef BINARYFUNC_MACRO_SFS

diff --git a/packages/stokhos/src/sacado/kokkos/vector/Sacado_MP_Vector_ops.hpp b/packages/stokhos/src/sacado/kokkos/vector/Sacado_MP_Vector_ops.hpp
@@ -821,6 +821,8 @@ MP_BINARYOP_MACRO(min, MinOp, ::min, using std::min;)
 MP_BINARYOP_MACRO(max, MaxOp, max, using std::max;)
 MP_BINARYOP_MACRO(min, MinOp, min, using std::min;)
 #endif
+MP_BINARYOP_MACRO(fmax, FMaxOp, fmax, using std::fmax;)
+MP_BINARYOP_MACRO(fmin, FMinOp, fmin, using std::fmin;)
 
 #undef MP_BINARYOP_MACRO
 

diff --git a/packages/stokhos/test/UnitTest/Stokhos_SacadoMPVectorUnitTest.cpp b/packages/stokhos/test/UnitTest/Stokhos_SacadoMPVectorUnitTest.cpp
@@ -565,6 +565,9 @@ struct UnitTestSetup {
   /* Operators min and max are not supported for complex type. */                  \
   BINARYFUNC_UNIT_TEST(VEC, SCALAR_T, max  , max  , using std::max  ;, Max)        \
   BINARYFUNC_UNIT_TEST(VEC, SCALAR_T, min  , min  , using std::min  ;, Min)        \
+  /* Operators fmin and fmax are not supported for complex type. */                \
+  BINARYFUNC_UNIT_TEST(VEC, SCALAR_T, fmax , fmax , using std::fmax ;, FMax)       \
+  BINARYFUNC_UNIT_TEST(VEC, SCALAR_T, fmin , fmin , using std::fmin ;, FMin)       \
   /* Ternary test uses 'operator<' that is not defined for complex type. */        \
   TERNARY_UNIT_TEST(VEC, SCALAR_T)