Skip to content

Find SwiftPM metallib bundle near test binary #3562

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
RNT56 wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −4
Open

Find SwiftPM metallib bundle near test binary #3562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions mlx/backend/metal/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,10 @@ std::pair<MTL::Library*, NS::Error*> load_library_from_path(
}

#ifdef SWIFTPM_BUNDLE
MTL::Library* try_load_bundle(
MTL::Library* try_load_bundle_path(
MTL::Device* device,
NS::URL* url,
const std::string& bundle_path,
const std::string& lib_name) {
std::string bundle_path = std::string(url->fileSystemRepresentation()) + "/" +
SWIFTPM_BUNDLE + ".bundle";
auto bundle = NS::Bundle::alloc()->init(
NS::String::string(bundle_path.c_str(), NS::UTF8StringEncoding));
if (bundle != nullptr) {
Expand All @@ -100,6 +98,15 @@ MTL::Library* try_load_bundle(
return nullptr;
}

MTL::Library* try_load_bundle(
MTL::Device* device,
NS::URL* url,
const std::string& lib_name) {
std::string bundle_path = std::string(url->fileSystemRepresentation()) + "/" +
SWIFTPM_BUNDLE + ".bundle";
return try_load_bundle_path(device, bundle_path, lib_name);
}

MTL::Library* try_load_framework(
MTL::Device* device,
NS::URL* url,
Expand Down Expand Up @@ -130,6 +137,19 @@ std::pair<MTL::Library*, NS::Error*> load_swiftpm_library(
MTL::Device* device,
const std::string& lib_name) {
#ifdef SWIFTPM_BUNDLE
const std::string swiftpm_bundle_name =
std::string(SWIFTPM_BUNDLE) + ".bundle";

auto binary_dir = current_binary_dir();
for (int i = 0; i < 4 && !binary_dir.empty(); ++i) {
MTL::Library* library = try_load_bundle_path(
device, (binary_dir / swiftpm_bundle_name).string(), lib_name);
if (library != nullptr) {
return {library, nullptr};
}
binary_dir = binary_dir.parent_path();
}

MTL::Library* library =
try_load_bundle(device, NS::Bundle::mainBundle()->bundleURL(), lib_name);
if (library != nullptr) {
Expand All @@ -138,6 +158,16 @@ std::pair<MTL::Library*, NS::Error*> load_swiftpm_library(
auto bundles = NS::Bundle::allBundles();
for (int i = 0, c = (int)bundles->count(); i < c; i++) {
auto bundle = reinterpret_cast<NS::Bundle*>(bundles->object(i));
const auto bundle_url = bundle->bundleURL();
const std::string bundle_path = bundle_url->fileSystemRepresentation();
if (bundle_path.size() >= swiftpm_bundle_name.size() &&
bundle_path.rfind(swiftpm_bundle_name) ==
bundle_path.size() - swiftpm_bundle_name.size()) {
library = try_load_framework(device, bundle->resourceURL(), lib_name);
if (library != nullptr) {
return {library, nullptr};
}
}
library = try_load_bundle(device, bundle->resourceURL(), lib_name);
if (library != nullptr) {
return {library, nullptr};
Expand Down