Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ unsafe fn CreateEpFactories_impl(
);
}

mlx::install_error_handler();
let factory = MlxEpFactory::new(registration_name, ort_api, ep_api);
*factories.add(0) = factory.as_ptr();
*num_factories = 1;
Expand Down
31 changes: 31 additions & 0 deletions rust/src/mlx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,34 @@ mod float64_primitive_tests {
}
}
}

unsafe extern "C" fn log_mlx_error(
msg: *const std::os::raw::c_char,
_data: *mut std::os::raw::c_void,
) {
let msg = unsafe { std::ffi::CStr::from_ptr(msg) }.to_string_lossy();
log::error!("MLX error: {msg}");
}

pub fn install_error_handler() {
unsafe { mlx::mlx_set_error_handler(Some(log_mlx_error), std::ptr::null_mut(), None) };
}

#[cfg(test)]
mod error_handler_tests {
use super::*;
use crate::sys::mlx as sys;

#[test]
fn op_failure_returns_error_code_instead_of_exiting() {
install_error_handler();
let (a_data, b_data) = ([0f32; 2], [0f32; 3]);
let a = Array::from_data(a_data.as_ptr().cast(), &[2], sys::mlx_dtype__MLX_FLOAT32);
let b = Array::from_data(b_data.as_ptr().cast(), &[3], sys::mlx_dtype__MLX_FLOAT32);
let stream = Stream::new_default_cpu();
let mut raw = unsafe { sys::mlx_array_new() };
let rc = unsafe { sys::mlx_add(&mut raw, a.as_raw(), b.as_raw(), stream.as_raw()) };
drop(Array::from_raw(raw));
assert_ne!(rc, 0, "broadcasting [2] with [3] must fail");
}
}