Merge pull request #32 from drasticactions/runtime-targets

Remove native libraries from LLama.csproj and replace it with a targets file.

LLama.Examples/LLama.Examples.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x64</Platforms>
+    <!-- Set IncludeBuiltInRuntimes to false to include your own runtime libraries and not link the defaults -->
+    <IncludeBuiltInRuntimes>true</IncludeBuiltInRuntimes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

LLama.Unittest/LLama.Unittest.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>LLama.Unittest</RootNamespace>

LLama.WebAPI/LLama.WebAPI.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
+  <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>

LLama/LLamaSharp.Runtime.targets

@@ -0,0 +1,35 @@
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <IncludeBuiltInRuntimes Condition="'$(IncludeBuiltInRuntimes)' == ''">true</IncludeBuiltInRuntimes>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(IncludeBuiltInRuntimes)' == 'true'">
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama.dll</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda11.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama-cuda11.dll</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda12.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama-cuda12.dll</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama.so</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda11.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama-cuda11.so</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama-cuda12.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama-cuda12.so</Link>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)runtimes/libllama.dylib">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libllama.dylib</Link>
+        </None>
+    </ItemGroup>
+</Project>

LLama/LLamaSharp.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>LLama</RootNamespace>
@@ -18,7 +17,8 @@
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/44989469?s=200&amp;v=4</PackageIconUrl>
     <PackageTags>LLama, LLM, GPT, ChatGPT, NLP, AI, Chat Bot, SciSharp</PackageTags>
     <Description>
-      The .NET binding of LLama.cpp, providing APIs to run the model and deploy it on Web. For model weights to run, please go to https://github.com/SciSharp/LLamaSharp for more information.
+      The .NET binding of LLama.cpp, providing APIs to run the model and deploy it on Web. For model
+      weights to run, please go to https://github.com/SciSharp/LLamaSharp for more information.
     </Description>
     <PackageReleaseNotes>
       LLamaSharp 0.4.1 followed up the master branch of llama.cpp. (commit id: aacdbd4)
@@ -46,35 +46,4 @@
     <PackageReference Include="System.Text.Json" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="runtimes/libllama.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama.dll</Link>
-    </None>
-    <None Include="runtimes/libllama-cuda11.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama-cuda11.dll</Link>
-    </None>
-    <None Include="runtimes/libllama-cuda12.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama-cuda12.dll</Link>
-    </None>
-    <None Include="runtimes/libllama.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama.so</Link>
-    </None>
-    <None Include="runtimes/libllama-cuda11.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama-cuda11.so</Link>
-    </None>
-    <None Include="runtimes/libllama-cuda12.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama-cuda12.so</Link>
-    </None>
-      <None Include="runtimes/libllama.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libllama.dylib</Link>
-    </None>
-</ItemGroup>
-
-</Project>
+</Project>