zhangyiss/mlx
1
0
Fork 0
mirror of https://github.com/ml-explore/mlx.git synced 2025-12-16 01:49:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make max op NaN propagation rules align with numpy

Browse Source
This commit is contained in:
Joona Havukainen
2025-07-06 14:27:40 -07:00
parent 0e0d9ac522
commit 0d30e9e8ec
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mlx/backend/metal/kernels/reduction/ops.h
View File

@@ -187,7 +187,10 @@ struct Max {
template <typename T>
T simd_reduce_impl(T val) {
return simd_max(val);
if(simd_any(val != val)) {
return static_cast<T>(NAN);
}
return simd_max(val);
}
static constexpr constant U init = Limits<U>::min;
@@ -198,7 +201,28 @@ struct Max {
}
// Operator
U operator()(U a, U b) {
template <typename T>
metal::enable_if_t<metal::is_integral_v<T>, T> operator()(T a, T b) {
return a > b ? a : b;
}
template <typename T>
metal::enable_if_t<!metal::is_integral_v<T>, T> operator()(T a, T b) {
if(metal::isnan(a) || metal::isnan(b)) {
return static_cast<T>(NAN);
} else {
return a > b ? a : b;
}
}
template <>
complex64_t operator()(complex64_t a, complex64_t b) {
if (metal::isnan(a.real) || metal::isnan(a.imag) || metal::isnan(b.real) || metal::isnan(b.imag)) {
return static_cast<complex64_t>(NAN);
}
return a > b ? a : b;
}
};

4
tests/ops_tests.cpp
View File

@@ -1024,6 +1024,10 @@ TEST_CASE("test reduction ops") {
x = array({true, true, true, false, true, false}, {2, 3});
CHECK(array_equal(min(x, 1), array({true, false})).item<bool>());
CHECK(array_equal(min(x, 0), array({false, true, false})).item<bool>());
x = array({1.0f, NAN, 3.0f});
CHECK(isnan(max(x).item<float>()));
}
// Test logsumexp