From: Georgi Gerganov <redacted>
Date: Sat, 6 Dec 2025 07:33:59 +0000 (+0200)
Subject: metal : fix build(#17799)
X-Git-Tag: upstream/0.9.4.395~53
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=56d5a8a696686dcf0bda7786443b2828d0672c00;p=pkg%2Fggml%2Fsources%2Fggml

metal : fix build(#17799)

* metal : fix build

* tests : fix context destruction
---

diff --git a/src/ggml-metal/ggml-metal-device.m b/src/ggml-metal/ggml-metal-device.m
index c53ec506..64fd9bdb 100644
--- a/src/ggml-metal/ggml-metal-device.m
+++ b/src/ggml-metal/ggml-metal-device.m
@@ -574,22 +574,26 @@ ggml_metal_rsets_t ggml_metal_rsets_init(void) {
     // the requests stop after a certain amount of time (keep_alive_s) of inactivity
     dispatch_queue_t d_queue = dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0);
     dispatch_group_async(res->d_group, d_queue, ^{
-          while (!atomic_load_explicit(&res->d_stop, memory_order_relaxed)) {
-              if (atomic_load_explicit(&res->d_loop, memory_order_relaxed) > 0) {
-                  [res->lock lock];
+#if defined(GGML_METAL_HAS_RESIDENCY_SETS)
+        if (@available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
+              while (!atomic_load_explicit(&res->d_stop, memory_order_relaxed)) {
+                  if (atomic_load_explicit(&res->d_loop, memory_order_relaxed) > 0) {
+                      [res->lock lock];
 
-                  for (int i = 0; i < (int) res->data.count; ++i) {
-                      [res->data[i] requestResidency];
-                  }
+                      for (int i = 0; i < (int) res->data.count; ++i) {
+                          [res->data[i] requestResidency];
+                      }
 
-                  atomic_fetch_sub_explicit(&res->d_loop, 1, memory_order_relaxed);
+                      atomic_fetch_sub_explicit(&res->d_loop, 1, memory_order_relaxed);
 
-                  [res->lock unlock];
-              }
+                      [res->lock unlock];
+                  }
 
-              // half a second
-              usleep(500 * 1000);
-          }
+                  // half a second
+                  usleep(500 * 1000);
+              }
+        }
+#endif
     });
 
     return res;
@@ -600,6 +604,7 @@ void ggml_metal_rsets_free(ggml_metal_rsets_t rsets) {
         return;
     }
 
+    // note: if you hit this assert, most likely you haven't deallocated all Metal resources before exiting
     GGML_ASSERT([rsets->data count] == 0);
 
     atomic_store_explicit(&rsets->d_stop, true, memory_order_relaxed);
@@ -787,9 +792,6 @@ ggml_metal_device_t ggml_metal_device_init(void) {
                 dev->rsets = nil;
             }
 
-
-            // --------------------------------------------------
-
             // print MTL GPU family:
             GGML_LOG_INFO("%s: GPU name:   %s\n", __func__, dev->props.name);