fix swift 6 warnings - thread safe tokenizer and model config #126
Conversation
This file contains 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
Collaborator
davidkoski
commented
Sep 12, 2024
•
davidkoski
commented
- based on Fix thread safety and Swift 6 warnings. #123 #125 with simpler mechanism (NSLock)
- replaces #125 with simpler mechanism (NSLock) Co-authored-by: John Mai <maiqingqiang@gmail.com>
davidkoski
commented
Sep 12, 2024
| private static func createLlamaModel(url: URL) throws -> LLMModel { | ||
| let configuration = try JSONDecoder().decode( | ||
| LlamaConfiguration.self, from: Data(contentsOf: url)) | ||
| return LlamaModel(configuration) | ||
| } | ||
|
|
||
| private static var creators: [String: (URL) throws -> LLMModel] = [ | ||
| private var creators: [String: @Sendable (URL) throws -> LLMModel] = [ |
There was a problem hiding this comment.
This is the key -- we want to mark it as storing thread safe (Sendable) closures.
davidkoski
commented
Sep 12, 2024
| creators[type] = creator | ||
| lock.withLock { | ||
| creators[type] = creator | ||
| } |
There was a problem hiding this comment.
by guarding the mutable state with the lock we can mark the type as Sendable (unchecked)
davidkoski
commented
Sep 12, 2024
|
|
||
| } | ||
|
|
||
| private let modelTypeRegistry = ModelTypeRegistry() |
There was a problem hiding this comment.
I made it a private global rather than a static property of ModelType. ModelType is the only access to it however
davidkoski
commented
Sep 12, 2024
| "CohereTokenizer": "PreTrainedTokenizer", | ||
| ] | ||
|
|
||
| public subscript(key: String) -> String? { |
There was a problem hiding this comment.
This ends up being source compatible with replacementTokenizers: [String:String] but uses an NSLock for thread safety.
davidkoski
commented
Sep 12, 2024
| @@ -7,7 +7,7 @@ import MLXNN | |||
| import MLXOptimizers | |||
| import MLXRandom | |||
|
|
|||
| #if swift(>=6.0) | |||
| #if swift(>=5.10) | |||
There was a problem hiding this comment.
Fixing some other warnings -- we don't necessarily need swift 6, but not all swift 5 understands this.
DePasqualeOrg
pushed a commit
to DePasqualeOrg/mlx-swift-examples
that referenced
this pull request
Oct 1, 2024
…lore#126) - replaces ml-explore#125 with simpler mechanism (NSLock) Co-authored-by: John Mai <maiqingqiang@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.