Skip to content

Fix dotnet publish // LLamaSharp conflicts #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dluc merged 2 commits into from
May 18, 2024
Merged

Fix dotnet publish // LLamaSharp conflicts #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa7b9f0
Fix dotnet publish // LLamaSharp conflicts
dluc May 18, 2024
c04029a
Fix typos
dluc May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<PackageVersion Include="HtmlAgilityPack" Version="1.11.61" />
<PackageVersion Include="LLamaSharp" Version="0.12.0" />
<PackageVersion Include="LLamaSharp.Backend.Cpu" Version="0.12.0" />
<PackageVersion Include="LLamaSharp.Backend.Cuda11" Version="0.12.0" />
<PackageVersion Include="LLamaSharp.Backend.Cuda12" Version="0.12.0" />
<PackageVersion Include="LLamaSharp.Backend.OpenCL" Version="0.12.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
Expand Down
8 changes: 8 additions & 0 deletions examples/105-dotnet-serverless-llamasharp/105-dotnet-serverless-llamasharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<!-- To run the example choose one of these backends -->
<PackageReference Include="LLamaSharp.Backend.Cpu" />
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda11" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda12" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.OpenCL" /> -->
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI.csproj" />
Expand Down
13 changes: 13 additions & 0 deletions examples/105-dotnet-serverless-llamasharp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
using Microsoft.KernelMemory;
using Microsoft.KernelMemory.AI.OpenAI;

/* PLEASE NOTE:
*
* The example is pre-configured to use a CPU backend.
*
* If your device provides CUDA or other backends, you can configure the example by editing the project file (*.csproj)
* and editing the LLamaSharp PackageReference, removing the CPU backend and choosing a different one.
*
* Kernel Memory web service is configured to not have ANY pre-configured LLamaSharp backend, e.g. KM Docker
* image does not work with LLamaSharp without manually mounting a LLamaSharp backend assembly into the
* Docker image at runtime. Same for custom .NET apps, which need to choose a LLamaSharp backend manually
* installing one of the available LLamaSharp.Backend packages.
*/

var llamaConfig = new LlamaSharpConfig();
var azureOpenAIEmbeddingConfig = new AzureOpenAIConfig();

Expand Down
12 changes: 10 additions & 2 deletions extensions/LlamaSharp/LlamaSharp/LlamaSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,16 @@

<ItemGroup>
<PackageReference Include="LLamaSharp" />
<PackageReference Include="LLamaSharp.Backend.Cpu" />
<PackageReference Include="LLamaSharp.Backend.Cuda12" />

<!-- Kernel Memory web service is configured to not have ANY pre-configured LLamaSharp backend, e.g. KM Docker
image does not work with LLamaSharp without manually mounting a LLamaSharp backend assembly into the
Docker image at runtime. Same for custom .NET apps, which need to choose a LLamaSharp backend manually
installing one of the available LLamaSharp.Backend packages. -->

<!-- <PackageReference Include="LLamaSharp.Backend.Cpu" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda11" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda12" /> -->

<PackageReference Include="System.Linq.Async" />
</ItemGroup>

Expand Down
9 changes: 9 additions & 0 deletions service/Service/Service.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
<PackageReference Include="Swashbuckle.AspNetCore" />
</ItemGroup>

<ItemGroup>
<!-- If you plan on using LLamaSharp, you will need to enable one of these backends,
which depend on the hardware hosting Kernel Memory code. -->

<!-- <PackageReference Include="LLamaSharp.Backend.Cpu" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda11" /> -->
<!-- <PackageReference Include="LLamaSharp.Backend.Cuda12" /> -->
</ItemGroup>

<!--
This dependency is needed only to generate appsetting.development.json via

Expand Down