From: Georgi Gerganov <redacted>
Date: Sun, 8 Oct 2023 08:24:50 +0000 (+0300)
Subject: ci : enable on obj-c changes + fix metal build (#3540)
X-Git-Tag: upstream/0.0.4488~3138
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=94e502dfb79430870b42b8e8ee132b4aaa93e4a8;p=pkg%2Fggml%2Fsources%2Fllama.cpp

ci : enable on obj-c changes + fix metal build (#3540)
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1e36ee2..e41be76d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,10 +10,10 @@ on:
   push:
     branches:
       - master
-    paths: ['.github/workflows/**', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift']
+    paths: ['.github/workflows/**', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m']
   pull_request:
     types: [opened, synchronize, reopened]
-    paths: ['**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift']
+    paths: ['**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m']
 
 env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
diff --git a/ggml-metal.m b/ggml-metal.m
index 57c238dd..92956ed9 100644
--- a/ggml-metal.m
+++ b/ggml-metal.m
@@ -301,12 +301,11 @@ struct ggml_metal_context * ggml_metal_init(int n_cb) {
 #if TARGET_OS_OSX
     // print MTL GPU family:
     GGML_METAL_LOG_INFO("%s: GPU name:   %s\n", __func__, [[ctx->device name] UTF8String]);
-    GGML_METAL_LOG_INFO("%s: GPU arch:   %s\n", __func__, [[ctx->device architecture].name UTF8String]);
 
     // determine max supported GPU family
     // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
     // https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
-    for (int i = MTLGPUFamilyApple9 + 10; i >= MTLGPUFamilyApple1; --i) {
+    for (int i = MTLGPUFamilyApple1 + 20; i >= MTLGPUFamilyApple1; --i) {
         if ([ctx->device supportsFamily:i]) {
             GGML_METAL_LOG_INFO("%s: GPU family: MTLGPUFamilyApple%d (%d)\n", __func__, i - MTLGPUFamilyApple1 + 1, i);
             break;