no segfault with uninitialized array.at (#2514)

This commit is contained in:
Awni Hannun 2025-08-18 08:33:38 -07:00 committed by GitHub
parent c5fcd5b61b
commit e7c6e1db82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 0 deletions

View File

@ -28,30 +28,45 @@ class ArrayAt {
public: public:
ArrayAt(mx::array x) : x_(std::move(x)) {} ArrayAt(mx::array x) : x_(std::move(x)) {}
ArrayAt& set_indices(nb::object indices) { ArrayAt& set_indices(nb::object indices) {
initialized_ = true;
indices_ = indices; indices_ = indices;
return *this; return *this;
} }
void check_initialized() {
if (!initialized_) {
throw std::invalid_argument(
"Must give indices to array.at (e.g. `x.at[0].add(4)`).");
}
}
mx::array add(const ScalarOrArray& v) { mx::array add(const ScalarOrArray& v) {
check_initialized();
return mlx_add_item(x_, indices_, v); return mlx_add_item(x_, indices_, v);
} }
mx::array subtract(const ScalarOrArray& v) { mx::array subtract(const ScalarOrArray& v) {
check_initialized();
return mlx_subtract_item(x_, indices_, v); return mlx_subtract_item(x_, indices_, v);
} }
mx::array multiply(const ScalarOrArray& v) { mx::array multiply(const ScalarOrArray& v) {
check_initialized();
return mlx_multiply_item(x_, indices_, v); return mlx_multiply_item(x_, indices_, v);
} }
mx::array divide(const ScalarOrArray& v) { mx::array divide(const ScalarOrArray& v) {
check_initialized();
return mlx_divide_item(x_, indices_, v); return mlx_divide_item(x_, indices_, v);
} }
mx::array maximum(const ScalarOrArray& v) { mx::array maximum(const ScalarOrArray& v) {
check_initialized();
return mlx_maximum_item(x_, indices_, v); return mlx_maximum_item(x_, indices_, v);
} }
mx::array minimum(const ScalarOrArray& v) { mx::array minimum(const ScalarOrArray& v) {
check_initialized();
return mlx_minimum_item(x_, indices_, v); return mlx_minimum_item(x_, indices_, v);
} }
private: private:
mx::array x_; mx::array x_;
bool initialized_{false};
nb::object indices_; nb::object indices_;
}; };

View File

@ -1365,6 +1365,9 @@ class TestArray(mlx_tests.MLXTestCase):
def test_array_at(self): def test_array_at(self):
a = mx.array(1) a = mx.array(1)
with self.assertRaises(ValueError):
a.at.add(1)
a = a.at[None].add(1) a = a.at[None].add(1)
self.assertEqual(a.item(), 2) self.assertEqual(a.item(), 2)