Merge feat: add detection template for cuda and avx. SciSharp#268

Just merge cuda and avx detection and change layout.
SignalRT · Nov 8, 2023 · b4b3ea9 · b4b3ea9
1 parent 091b8d5
commit b4b3ea9
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/LLama/LLamaSharp.Runtime.targets b/LLama/LLamaSharp.Runtime.targets
@@ -3,41 +3,41 @@
         <IncludeBuiltInRuntimes Condition="'$(IncludeBuiltInRuntimes)' == ''">true</IncludeBuiltInRuntimes>
     </PropertyGroup>
     <ItemGroup Condition="'$(IncludeBuiltInRuntimes)' == 'true'">
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama.dll">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/win-x64/libllama.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama.dll</Link>
+            <Link>runtimes/win-x64/libllama.dll</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda11.dll">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/win-x64/libllama-cuda11.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama-cuda11.dll</Link>
+            <Link>runtimes/win-x64/libllama-cuda11.dll</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda12.dll">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/win-x64/libllama-cuda12.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama-cuda12.dll</Link>
+            <Link>runtimes/win-x64/libllama-cuda12.dll</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama.so">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/linux-x64/libllama.so">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama.so</Link>
+            <Link>runtimes/linux-x64/libllama.so</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda11.so">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/linux-x64/libllama-cuda11.so">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama-cuda11.so</Link>
+            <Link>runtimes/linux-x64/libllama-cuda11.so</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda12.so">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/linux-x64/libllama-cuda12.so">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>libllama-cuda12.so</Link>
+            <Link>runtimes/linux-x64/libllama-cuda12.so</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/macos-arm64/libllama.dylib">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/osx-arm64/libllama.dylib">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>runtimes/macos-arm64/libllama.dylib</Link>
+            <Link>runtimes/osx-arm64/libllama.dylib</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/macos-arm64/ggml-metal.metal">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/osx-arm64/ggml-metal.metal">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>runtimes/macos-arm64/ggml-metal.metal</Link>
+            <Link>runtimes/osx-arm64/ggml-metal.metal</Link>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)runtimes/macos-x86_64/libllama.dylib">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/osx-x64/libllama.dylib">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>runtimes/macos-x86_64/libllama.dylib</Link>
+            <Link>runtimes/osx-x64/libllama.dylib</Link>
         </None>
     </ItemGroup>
 </Project>
diff --git a/LLama/Native/NativeApi.cs b/LLama/Native/NativeApi.cs
@@ -110,15 +110,15 @@ private static IntPtr LLamaImportResolver(string name, Assembly assembly, DllImp
                 var cudaVersion = GetCudaVersion();
                 if(cudaVersion == 11)
                 {
-                    libraryPath = $"runtimes/win-x64/native/libllama-cuda11{avxFlag}.dll";
+                    libraryPath = $"runtimes/win-x64/libllama-cuda11{avxFlag}.dll";
                 }
                 else if (cudaVersion == 12)
                 {
-                    libraryPath = $"runtimes/win-x64/native/libllama-cuda12{avxFlag}.dll";
+                    libraryPath = $"runtimes/win-x64/libllama-cuda12{avxFlag}.dll";
                 }
                 else if(cudaVersion == -1) // cpu version
                 {
-                    libraryPath = $"runtimes/win-x64/native/libllama{avxFlag}.dll";
+                    libraryPath = $"runtimes/win-x64/libllama{avxFlag}.dll";
                 }
                 else
                 {
@@ -132,15 +132,15 @@ private static IntPtr LLamaImportResolver(string name, Assembly assembly, DllImp
                 var cudaVersion = GetCudaVersion();
                 if (cudaVersion == 11)
                 {
-                    libraryPath = $"runtimes/linux-x64/native/libllama-cuda11{avxFlag}.so";
+                    libraryPath = $"runtimes/linux-x64/libllama-cuda11{avxFlag}.so";
                 }
                 else if (cudaVersion == 12)
                 {
-                    libraryPath = $"runtimes/linux-x64/native/libllama-cuda12{avxFlag}.so";
+                    libraryPath = $"runtimes/linux-x64/libllama-cuda12{avxFlag}.so";
                 }
                 else if (cudaVersion == -1) // cpu version
                 {
-                    libraryPath = $"runtimes/linux-x64/native/libllama{avxFlag}.so";
+                    libraryPath = $"runtimes/linux-x64/libllama{avxFlag}.so";
                 }
                 else
                 {
@@ -151,11 +151,11 @@ private static IntPtr LLamaImportResolver(string name, Assembly assembly, DllImp
             {
                 if (System.Runtime.Intrinsics.Arm.ArmBase.Arm64.IsSupported)
                 {
-                    libraryPath = $"runtimes/osx-arm64/native/libllama.dylib";
+                    libraryPath = $"runtimes/osx-arm64/libllama.dylib";
                 }
                 else
                 {
-                    libraryPath = $"runtimes/osx-x64/native/libllama.dylib";
+                    libraryPath = $"runtimes/osx-x86_64/libllama.dylib";
                 }
             }
 

diff --git a/LLama/runtimes/libllama-cuda11.so → LLama/runtimes/linux-x64/libllama-cuda11.so b/LLama/runtimes/libllama-cuda11.so → LLama/runtimes/linux-x64/libllama-cuda11.so
diff --git a/LLama/runtimes/libllama-cuda12.so → LLama/runtimes/linux-x64/libllama-cuda12.so b/LLama/runtimes/libllama-cuda12.so → LLama/runtimes/linux-x64/libllama-cuda12.so
diff --git a/LLama/runtimes/libllama.so → LLama/runtimes/linux-x64/libllama.so b/LLama/runtimes/libllama.so → LLama/runtimes/linux-x64/libllama.so
diff --git a/LLama/runtimes/macos-arm64/ggml-metal.metal → LLama/runtimes/osx-arm64/ggml-metal.metal b/LLama/runtimes/macos-arm64/ggml-metal.metal → LLama/runtimes/osx-arm64/ggml-metal.metal
diff --git a/LLama/runtimes/macos-arm64/libllama.dylib → LLama/runtimes/osx-arm64/libllama.dylib b/LLama/runtimes/macos-arm64/libllama.dylib → LLama/runtimes/osx-arm64/libllama.dylib
diff --git a/LLama/runtimes/macos-x86_64/libllama.dylib → LLama/runtimes/osx-x64/libllama.dylib b/LLama/runtimes/macos-x86_64/libllama.dylib → LLama/runtimes/osx-x64/libllama.dylib
diff --git a/LLama/runtimes/libllama-cuda11.dll → LLama/runtimes/win-x64/libllama-cuda11.dll b/LLama/runtimes/libllama-cuda11.dll → LLama/runtimes/win-x64/libllama-cuda11.dll
diff --git a/LLama/runtimes/libllama-cuda12.dll → LLama/runtimes/win-x64/libllama-cuda12.dll b/LLama/runtimes/libllama-cuda12.dll → LLama/runtimes/win-x64/libllama-cuda12.dll
diff --git a/LLama/runtimes/libllama.dll → LLama/runtimes/win-x64/libllama.dll b/LLama/runtimes/libllama.dll → LLama/runtimes/win-x64/libllama.dll