From f470042e71cfa6e9bfa00e16a754c4fc980bd853 Mon Sep 17 00:00:00 2001
From: Paul Tsochantaris <ptsochantaris@icloud.com>
Date: Wed, 17 Jan 2024 20:26:41 +0000
Subject: [PATCH 1/3] Metal memory: Small memory leak on init, dangling
 pointer, and unused autorelease pool in graph compute

---
 ggml-metal.m | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ggml-metal.m b/ggml-metal.m
index 66d4d675eb32f..912ddc83f7d9c 100644
--- a/ggml-metal.m
+++ b/ggml-metal.m
@@ -238,21 +238,19 @@ static void ggml_metal_log(enum ggml_log_level level, const char * format, ...){
 static struct ggml_metal_context * ggml_metal_init(int n_cb) {
     GGML_METAL_LOG_INFO("%s: allocating\n", __func__);
 
-    id<MTLDevice> device;
-    NSString * s;
-
-#if TARGET_OS_OSX
+#if TARGET_OS_OSX && !GGML_METAL_NDEBUG
     // Show all the Metal device instances in the system
     NSArray * devices = MTLCopyAllDevices();
-    for (device in devices) {
-        s = [device name];
+    for (id<MTLDevice> device in devices) {
+        NSString * s = [device name];
         GGML_METAL_LOG_INFO("%s: found device: %s\n", __func__, [s UTF8String]);
     }
+    [devices release]; // since it was created by a *Copy* C method
 #endif
 
     // Pick and show default Metal device
-    device = MTLCreateSystemDefaultDevice();
-    s = [device name];
+    id<MTLDevice> device = MTLCreateSystemDefaultDevice();
+    NSString * s = [device name];
     GGML_METAL_LOG_INFO("%s: picking default device: %s\n", __func__, [s UTF8String]);
 
     // Configure context
@@ -712,7 +710,6 @@ static bool ggml_metal_supports_op(const struct ggml_metal_context * ctx, const
 static bool ggml_metal_graph_compute(
         struct ggml_metal_context * ctx,
                struct ggml_cgraph * gf) {
-    @autoreleasepool {
 
     MTLComputePassDescriptor * edesc = MTLComputePassDescriptor.computePassDescriptor;
     edesc.dispatchType = MTLDispatchTypeSerial;
@@ -2255,7 +2252,6 @@ static bool ggml_metal_graph_compute(
     }
 
     return true;
-    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 130eac86607b7e4711002a5afab9a7bb92230fee Mon Sep 17 00:00:00 2001
From: Paul Tsochantaris <ptsochantaris@icloud.com>
Date: Wed, 17 Jan 2024 21:40:29 +0000
Subject: [PATCH 2/3] SPM header potential fix

---
 spm-headers/ggml-alloc.h   | 1 +
 spm-headers/ggml-backend.h | 1 +
 spm-headers/ggml.h         | 1 +
 3 files changed, 3 insertions(+)
 create mode 120000 spm-headers/ggml-alloc.h
 create mode 120000 spm-headers/ggml-backend.h
 create mode 120000 spm-headers/ggml.h

diff --git a/spm-headers/ggml-alloc.h b/spm-headers/ggml-alloc.h
new file mode 120000
index 0000000000000..a49d385a1b864
--- /dev/null
+++ b/spm-headers/ggml-alloc.h
@@ -0,0 +1 @@
+../ggml-alloc.h
\ No newline at end of file
diff --git a/spm-headers/ggml-backend.h b/spm-headers/ggml-backend.h
new file mode 120000
index 0000000000000..17c2cf14fe02b
--- /dev/null
+++ b/spm-headers/ggml-backend.h
@@ -0,0 +1 @@
+../ggml-backend.h
\ No newline at end of file
diff --git a/spm-headers/ggml.h b/spm-headers/ggml.h
new file mode 120000
index 0000000000000..39215298f981b
--- /dev/null
+++ b/spm-headers/ggml.h
@@ -0,0 +1 @@
+../ggml.h
\ No newline at end of file

From 1c98f9933cf83f6764b3f3413ee7f687c679e1e6 Mon Sep 17 00:00:00 2001
From: Paul Tsochantaris <ptsochantaris@icloud.com>
Date: Wed, 17 Jan 2024 21:52:02 +0000
Subject: [PATCH 3/3] Reverting symlinks

---
 spm-headers/ggml-alloc.h   | 1 -
 spm-headers/ggml-backend.h | 1 -
 spm-headers/ggml.h         | 1 -
 3 files changed, 3 deletions(-)
 delete mode 120000 spm-headers/ggml-alloc.h
 delete mode 120000 spm-headers/ggml-backend.h
 delete mode 120000 spm-headers/ggml.h

diff --git a/spm-headers/ggml-alloc.h b/spm-headers/ggml-alloc.h
deleted file mode 120000
index a49d385a1b864..0000000000000
--- a/spm-headers/ggml-alloc.h
+++ /dev/null
@@ -1 +0,0 @@
-../ggml-alloc.h
\ No newline at end of file
diff --git a/spm-headers/ggml-backend.h b/spm-headers/ggml-backend.h
deleted file mode 120000
index 17c2cf14fe02b..0000000000000
--- a/spm-headers/ggml-backend.h
+++ /dev/null
@@ -1 +0,0 @@
-../ggml-backend.h
\ No newline at end of file
diff --git a/spm-headers/ggml.h b/spm-headers/ggml.h
deleted file mode 120000
index 39215298f981b..0000000000000
--- a/spm-headers/ggml.h
+++ /dev/null
@@ -1 +0,0 @@
-../ggml.h
\ No newline at end of file