mirror of
https://github.com/ml-explore/mlx.git
synced 2025-09-27 00:08:09 +08:00
fix: library loading for swift dynamic frameworks (#2568)
This commit is contained in:
@@ -108,7 +108,7 @@ std::pair<MTL::Library*, NS::Error*> load_swiftpm_library(
|
|||||||
}
|
}
|
||||||
|
|
||||||
MTL::Library* load_default_library(MTL::Device* device) {
|
MTL::Library* load_default_library(MTL::Device* device) {
|
||||||
NS::Error* error[4];
|
NS::Error* error[5];
|
||||||
MTL::Library* lib;
|
MTL::Library* lib;
|
||||||
// First try the colocated mlx.metallib
|
// First try the colocated mlx.metallib
|
||||||
std::tie(lib, error[0]) = load_colocated_library(device, "mlx");
|
std::tie(lib, error[0]) = load_colocated_library(device, "mlx");
|
||||||
@@ -127,12 +127,19 @@ MTL::Library* load_default_library(MTL::Device* device) {
|
|||||||
return lib;
|
return lib;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Try lo load resources from Framework resources if SwiftPM wrapped as a
|
||||||
|
// dynamic framework.
|
||||||
|
std::tie(lib, error[3]) = load_colocated_library(device, "Resources/default");
|
||||||
|
if (lib) {
|
||||||
|
return lib;
|
||||||
|
}
|
||||||
|
|
||||||
// Finally try default_mtllib_path
|
// Finally try default_mtllib_path
|
||||||
std::tie(lib, error[3]) = load_library_from_path(device, default_mtllib_path);
|
std::tie(lib, error[4]) = load_library_from_path(device, default_mtllib_path);
|
||||||
if (!lib) {
|
if (!lib) {
|
||||||
std::ostringstream msg;
|
std::ostringstream msg;
|
||||||
msg << "Failed to load the default metallib. ";
|
msg << "Failed to load the default metallib. ";
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
if (error[i] != nullptr) {
|
if (error[i] != nullptr) {
|
||||||
msg << error[i]->localizedDescription()->utf8String() << " ";
|
msg << error[i]->localizedDescription()->utf8String() << " ";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user