forked from ml-explore/mlx-swift-lm
-
Notifications
You must be signed in to change notification settings - Fork 9
fix(moe): gracefully catch safetensors I/O errors to prevent deadlock crashes #36
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import Foundation | ||
| import MLX | ||
|
|
||
| package final class ThreadSafeError: @unchecked Sendable { | ||
| package let lock = NSLock() | ||
| package var error: Swift.Error? | ||
|
|
||
| package init() {} | ||
|
|
||
| package func catchError(_ block: () throws -> Void) { | ||
| do { | ||
| try MLX.withError { | ||
| try block() | ||
| } | ||
| } catch { | ||
| lock.withLock { | ||
| if self.error == nil { self.error = error } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| package func check() { | ||
| if let error = error { | ||
| fatalError("MLX SSD Streaming Error: \(error.localizedDescription). (The model safetensors file may be corrupted, truncated, or incomplete).") | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import Foundation | ||
| import MLX | ||
| import MLXLMCommon | ||
| import Testing | ||
|
|
||
| @Suite | ||
| struct CorruptSafetensorsTests { | ||
| @Test | ||
| func testDeadlock() throws { | ||
| let tempDir = FileManager.default.temporaryDirectory | ||
| let pathUrl = tempDir.appendingPathComponent("dummy_corrupt_\(UUID().uuidString).safetensors") | ||
| let path = pathUrl.path | ||
|
|
||
| let dict: [String: MLXArray] = ["weight": MLXArray.zeros([256, 1024])] | ||
| try MLX.save(arrays: dict, url: pathUrl) | ||
|
|
||
| defer { | ||
| try? FileManager.default.removeItem(at: pathUrl) | ||
| } | ||
|
|
||
| let fd = open(path, O_RDWR) | ||
| #expect(fd != -1) | ||
| guard fd != -1 else { return } | ||
|
|
||
| defer { | ||
| let closeResult = close(fd) | ||
| #expect(closeResult == 0) | ||
| } | ||
|
|
||
| let truncateResult = ftruncate(fd, 100) | ||
| #expect(truncateResult == 0) | ||
| guard truncateResult == 0 else { return } | ||
|
|
||
| let dst = MLXArray.zeros([256, 1024]) | ||
| dst.eval() | ||
|
|
||
| struct SendableArray: @unchecked Sendable { | ||
| let array: MLXArray | ||
| } | ||
| let sendableDst = SendableArray(array: dst) | ||
|
|
||
| let errState = ThreadSafeError() | ||
|
|
||
| DispatchQueue.concurrentPerform(iterations: 16) { i in | ||
| errState.catchError { | ||
| MLXFast.preadIntoOffset(sendableDst.array, safetensorsPath: path, tensorName: "weight", expertIndex: UInt32(i), dstOffset: i * 1024 * 4) | ||
| } | ||
| } | ||
|
|
||
| #expect(errState.error != nil) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR description says the new wrapper will trigger a single clean crash "on the main thread", but
check()callsfatalErrordirectly on whichever thread invokescheck(). If the main-thread behavior is required,check()(or its callers) should explicitly dispatch/ensure main-thread execution; otherwise the PR description should be updated to match the actual behavior.