Skip to content

Replace sgemm() panics with Result-based error handling #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arrayka wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Replace sgemm() panics with Result-based error handling #997

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1850ca2
diskann_linalg::sgemm() should not panic
Apr 29, 2026
0193045
Added tests
Apr 29, 2026
f7c6694
Adding tests
Apr 29, 2026
e492436
Fixed tests
Apr 29, 2026
aec04df
Unify InvalidMatrixDimensions
Apr 29, 2026
f4f8291
Reduce size of SgemmError
May 1, 2026
761675c
error(transparent)
May 1, 2026
bf2211b
Remove old log-style error constructors
May 1, 2026
37d4543
Merge branch 'main' into u/arrayka/sgemm_panic
arrayka May 1, 2026
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
9 changes: 6 additions & 3 deletions diskann-disk/src/utils/math_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ pub fn compute_closest_centers_in_block(
&ones_a,
None, // Initialize the destination matrix
dist_matrix,
);
)
.map_err(|e| ANNError::log_index_error(format_args!("{}", e)))?;

diskann_linalg::sgemm(
Transpose::None,
Expand All @@ -185,7 +186,8 @@ pub fn compute_closest_centers_in_block(
centers_l2sq,
Some(1.0), // Add to the destination matrix
dist_matrix,
);
)
.map_err(|e| ANNError::log_index_error(format_args!("{}", e)))?;
Copy link
Copy Markdown
Contributor

@hildebrandmw hildebrandmw Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, you may want to prefer ANNError::new(ANNErrorKind::IndexError, e) instead of the old log* style constructors. The former defers any kind of string formatting until the entire error is formatter higher in the call stack, where-as the latter forces eager string evaluation lower in the callstack. Not that it matters that much though.

Copy link
Copy Markdown
Contributor Author

@arrayka arrayka May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done + created a task to remove the old log-style constructors: #1003


diskann_linalg::sgemm(
Transpose::None,
Expand All @@ -198,7 +200,8 @@ pub fn compute_closest_centers_in_block(
centers,
Some(1.0), // Add to the destination matrix.
dist_matrix,
);
)
.map_err(|e| ANNError::log_index_error(format_args!("{}", e)))?;

if k == 1 {
center_index
Expand Down
Loading
Loading