Repository navigation
🔄 Auto-Sync: ml-explore/mlx-swift main (78d3cc1, 4 commit(s)) - #30
Merged
Merged
Conversation
fix CI/infra failures -- xcode vs command line tools not matching == bad. Force the tools to use a consistent SDK.
…#517) Since ml-explore#502 every macOS build whose SDK ships <infiniband/verbs.h> links the JACCL distributed backend (RDMA over Thunderbolt 5), and dead stripping cannot remove it: `distributed::init("any")` reaches `jaccl::init`, and `MLXDistributed.Group` and the sharded MLXNN layers keep that path alive. An app that never forms a Thunderbolt cluster has no way to opt out. On a minimal MLX + MLXNN executable (release, stripped) the backend costs 1,065,280 bytes, 841 KB of them `__text`. Add a `JACCL` package trait, enabled by default, so an app can leave it out with `traits: []`: - `Package.swift` declares the trait and defines `MLX_USE_JACCL` for Cmlx when it is enabled. SwiftPM passes traits to Swift targets only, so C++ needs the explicit define. - `jaccl_conditional.cpp` requires `MLX_USE_JACCL` and compiles the `no_jaccl.cpp` stub otherwise. - `Cmlx.xcconfig` always defines `MLX_USE_JACCL`, so the Xcode project and its xcframeworks build as before. - `install.md` documents the trait and that SwiftPM enables the union of the traits that dependents request. The define follows the `MLX_USE_ACCELERATE` naming. Default on keeps the behaviour of ml-explore#502. The define states only the choice; platform and SDK gating stay in `jaccl_conditional.cpp`, so iOS, tvOS and visionOS keep building the stub whatever the trait. The CMake build keeps mlx's own JACCL gating.
Automated merge by the upstream-sync workflow. 4 upstream commit(s). Merge with a merge commit, not squash/rebase.
Upstream's JACCL package trait (ml-explore#517) needs tools-version 6.1 or later; the fork manifest was 5.12, so the manifest no longer parsed after the sync. Keep Swift 5 language mode (what 5.12 implied) via swiftLanguageModes. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
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
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.
Automated real merge of
ml-explore/mlx-swiftmain (78d3cc1, 4 commit(s) not yet in this fork) intomain. Upstream changes: ml-explore/mlx-swift@392aa34...78d3cc1Merge this PR with a merge commit ("Create a merge commit"), not squash or rebase. Squashing orphans the upstream commits and the fork commits that downstream repos pin (submodule SHAs).
Upstream commits
78d3cc1Add a JACCL package trait to opt out of the JACCL backend (#517)(Alessio Pollero)7ede4fdFix firstError (#513)(Lukas Zima)5310622Support 0.32.4 distributed functions (#512)(Ronald Mannak)3b4b6dbdebug CI failure (#514)(David Koski)Needs a human look
Package.swiftSource/Cmlx/mlx-conditional/jaccl_conditional.cpp.github/workflows/pull_request.ymlWhat was checked
-X ours/theirs); the fork's workflows were restored unchanged.Bot disclosure
Prepared by the
upstream-syncGitHub Actions workflow. The workflow never approves, reviews or merges; no human has reviewed this merge yet.