CERBERUS/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-10-20 18:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mlx: fix patch for recent mlx update (#18812)

Browse source
This commit is contained in:
Daniel Hiltgen 2026-10-05 18:15:59 -07:00 • committed by GitHub
parent 18846f8a9b
commit 8a971df3ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mlx/compat/mlx/0001-metal-residency-refresh.patch
View file

@ -11,7 +11,7 @@ diff --git a/mlx/backend/metal/resident.cpp b/mlx/backend/metal/resident.cpp
#include <cstdio>
#include <sstream>
#include <stdexcept>
@@ -42,10 +43,38 @@
@@ -43,10 +44,38 @@
}
throw std::runtime_error(msg.str());
}
@ -52,12 +52,12 @@ diff --git a/mlx/backend/metal/resident.cpp b/mlx/backend/metal/resident.cpp
+ }
+}
bool ResidencySets::add_set_locked(NS::Error** error_out) {
bool ResidencySets::add_set_locked(std::string* error_out) {
NS::SharedPtr<MTL::ResidencySet> set;
diff --git a/mlx/backend/metal/resident.h b/mlx/backend/metal/resident.h
--- a/mlx/backend/metal/resident.h
+++ b/mlx/backend/metal/resident.h
@@ -1,10 +1,12 @@
@@ -1,11 +1,13 @@
-// Copyright © 2024 Apple Inc.
+// Copyright © 2024-2026 Apple Inc.
@ -67,11 +67,12 @@ diff --git a/mlx/backend/metal/resident.h b/mlx/backend/metal/resident.h
+#include <condition_variable>
#include <cstdint>
#include <mutex>
#include <string>
+#include <thread>
#include <unordered_map>
#include <vector>
@@ -118,6 +120,9 @@
@@ -119,6 +121,9 @@
// taking the lock.
std::atomic<uint64_t> num_sets_{0};
mutable std::mutex mtx_;