Merge pull request #1331 from m0nsky/fix/remove-standalone-metal-shader

Fix/remove standalone metal shader

Author: martindevans

.github/workflows/compile.yml

@@ -529,14 +529,6 @@ jobs:
           path: ./build/bin/libmtmd.dylib
           name: mtmd-bin-osx-${{ matrix.build }}.dylib
           if-no-files-found: error
-      - name: Upload Metal
-        if: ${{ matrix.build == 'arm64' }}
-        uses: actions/upload-artifact@v4
-        with:
-          path: ./build/bin/ggml-metal.metal
-          name: ggml-metal.metal
-          if-no-files-found: error
-  
   compile-android:
     name: Compile (Android)
     strategy:
@@ -711,8 +703,6 @@ jobs:
           cp artifacts/ggml-metal-bin-osx-arm64.dylib/libggml-metal.dylib deps/osx-arm64/libggml-metal.dylib
           cp artifacts/llama-bin-osx-arm64.dylib/libllama.dylib           deps/osx-arm64/libllama.dylib
           cp artifacts/mtmd-bin-osx-arm64.dylib/libmtmd.dylib             deps/osx-arm64/libmtmd.dylib
-          cp artifacts/ggml-metal.metal/ggml-metal.metal                  deps/osx-arm64/ggml-metal.metal
-            
           cp artifacts/ggml-bin-osx-x64.dylib/libggml.dylib             deps/osx-x64/libggml.dylib
           cp artifacts/ggml-base-bin-osx-x64.dylib/libggml-base.dylib   deps/osx-x64/libggml-base.dylib
           cp artifacts/ggml-cpu-bin-osx-x64.dylib/libggml-cpu.dylib     deps/osx-x64/libggml-cpu.dylib
@@ -781,5 +771,4 @@ jobs:
           name: |
             llama-*
             mtmd-*
-            *.metal
             ggml-*

LLama/LLamaSharp.Runtime.targets

@@ -339,11 +339,6 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Link>runtimes/osx-arm64/native/libmtmd.dylib</Link>
       </None>
-      <None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-arm64/ggml-metal.metal">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <Link>runtimes/osx-arm64/native/ggml-metal.metal</Link>
-      </None>
-
       <None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-x64/libggml-base.dylib">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <Link>runtimes/osx-x64/native/libggml-base.dylib</Link>

LLama/LLamaSharp.csproj

@@ -74,7 +74,7 @@
   <!-- This automatically runs after CheckReleaseBinaries has completed, but only if SkipDownloadReleaseBinaries is not true -->
   <Target Name="UnzipReleaseBinaries" DependsOnTargets="DownloadReleaseBinaries" AfterTargets="CheckReleaseBinaries" Condition="'$(SkipDownloadReleaseBinaries)' != 'true'">
 	<Message Importance="High" Text="Unzip '$(BinaryReleaseId)/deps.zip'" />
-	<Unzip SourceFiles="runtimes/deps.zip" DestinationFolder="runtimes/deps/" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" Include="*.dll;*.so;*.dylib;*.metal;" />
+	<Unzip SourceFiles="runtimes/deps.zip" DestinationFolder="runtimes/deps/" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" Include="*.dll;*.so;*.dylib;" />
   </Target>
 
   <Target Name="CheckReleaseBinaries">

LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec

@@ -115,7 +115,6 @@
         <file src="runtimes/deps/osx-arm64/libggml-cpu.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-cpu.dylib" />
         <file src="runtimes/deps/osx-arm64/libggml-blas.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-blas.dylib" />
         <file src="runtimes/deps/osx-arm64/libggml-metal.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-metal.dylib" />
-        <file src="runtimes/deps/osx-arm64/ggml-metal.metal" target="LLamaSharpRuntimes\osx-arm64\native\ggml-metal.metal" />
         <file src="runtimes/deps/osx-arm64/libllama.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libllama.dylib" />
         <file src="runtimes/deps/osx-arm64/libmtmd.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libmtmd.dylib" />