mirror of
https://github.com/ml-explore/mlx.git
synced 2025-07-04 16:21:14 +08:00
Revert "Search mlx.metallib in macOS framework"
This reverts commit f360823cee
.
This commit is contained in:
parent
f360823cee
commit
b16a1d50b2
@ -1,6 +1,5 @@
|
||||
// Copyright © 2023-2024 Apple Inc.
|
||||
|
||||
#include <array>
|
||||
#include <cstdlib>
|
||||
#include <sstream>
|
||||
|
||||
@ -18,22 +17,6 @@
|
||||
|
||||
namespace mlx::core::metal {
|
||||
|
||||
std::string search_colocated_mtllib(
|
||||
const fs::path& dli_path,
|
||||
const std::string& lib_name) {
|
||||
auto dir_name = dli_path.parent_path();
|
||||
std::array search_list{
|
||||
dir_name / lib_name,
|
||||
dir_name / "Resources" / lib_name // in macOS framework
|
||||
};
|
||||
for (const auto& lib_path : search_list) {
|
||||
if (fs::exists(lib_path)) {
|
||||
return lib_path.c_str();
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
constexpr const char* default_mtllib_path = METAL_PATH;
|
||||
|
@ -19,10 +19,6 @@ namespace fs = std::filesystem;
|
||||
|
||||
namespace mlx::core::metal {
|
||||
|
||||
std::string search_colocated_mtllib(
|
||||
const fs::path& dli_path,
|
||||
const std::string& lib_name);
|
||||
|
||||
// Note, this function must be left inline in a header so that it is not
|
||||
// dynamically linked.
|
||||
inline std::string get_colocated_mtllib_path(const std::string& lib_name) {
|
||||
@ -32,7 +28,8 @@ inline std::string get_colocated_mtllib_path(const std::string& lib_name) {
|
||||
|
||||
int success = dladdr((void*)get_colocated_mtllib_path, &info);
|
||||
if (success) {
|
||||
mtllib_path = search_colocated_mtllib(fs::path(info.dli_fname), lib_ext);
|
||||
auto mtllib = fs::path(info.dli_fname).remove_filename() / lib_ext;
|
||||
mtllib_path = mtllib.c_str();
|
||||
}
|
||||
|
||||
return mtllib_path;
|
||||
|
Loading…
Reference in New Issue
Block a user