Skip to content

Nuget Universal Props File #658

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

Closed
martindevans wants to merge 2 commits into from
Closed

Nuget Universal Props File #658

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
6c7df40
Moved the .props file to build directory, instead of just netstandard…
martindevans Apr 7, 2024
262eb87
Placing all native binaries in `llama` folder, instead of runtimes. T…
martindevans Apr 11, 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
6 changes: 3 additions & 3 deletions LLama/Native/NativeApi.Load.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private static string GetMacLibraryPath(string libraryName)
{
GetPlatformPathParts(out _, out var os, out var fileExtension, out var libPrefix);

return $"runtimes/{os}/native/{libPrefix}{libraryName}{fileExtension}";
return $"llama/{os}/native/{libPrefix}{libraryName}{fileExtension}";
}

/// <summary>
Expand All @@ -267,7 +267,7 @@ private static string GetCudaLibraryPath(string libraryName, string cuda)
{
GetPlatformPathParts(out _, out var os, out var fileExtension, out var libPrefix);

return $"runtimes/{os}/native/{cuda}/{libPrefix}{libraryName}{fileExtension}";
return $"llama/{os}/native/{cuda}/{libPrefix}{libraryName}{fileExtension}";
}

/// <summary>
Expand All @@ -284,7 +284,7 @@ private static string GetAvxLibraryPath(string libraryName, NativeLibraryConfig.
if (!string.IsNullOrEmpty(avxStr))
avxStr += "/";

return $"runtimes/{os}/native/{avxStr}{libPrefix}{libraryName}{fileExtension}";
return $"llama/{os}/native/{avxStr}{libPrefix}{libraryName}{fileExtension}";
}

private static void GetPlatformPathParts(out OSPlatform platform, out string os, out string fileExtension, out string libPrefix)
Expand Down
52 changes: 28 additions & 24 deletions LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>LLamaSharp.Backend.Cpu</id>
<version>$version$</version>
<version>0.11.2</version>
<title>LLamaSharp.Backend.Cpu, the backend for LLamaSharp</title>
<authors>llama.cpp Authors</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -13,38 +13,42 @@
<releaseNotes></releaseNotes>
<copyright>Copyright 2023 The llama.cpp Authors. All rights reserved.</copyright>
<tags>LLamaSharp LLama LLM GPT AI ChatBot SciSharp</tags>
<contentFiles>
<files include="any\any\llama\**\*.*" buildAction="None" copyToOutput="true" />
</contentFiles>
</metadata>

<files>
<file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cpu.props" />
<file src="runtimes/deps/llama.dll" target="contentFiles\any\any\llama\win-x64\native\llama.dll" />
<file src="runtimes/deps/avx/llama.dll" target="contentFiles\any\any\llama\win-x64\native\avx\llama.dll" />
<file src="runtimes/deps/avx2/llama.dll" target="contentFiles\any\any\llama\win-x64\native\avx2\llama.dll" />
<file src="runtimes/deps/avx512/llama.dll" target="contentFiles\any\any\llama\win-x64\native\avx512\llama.dll" />

<file src="runtimes/deps/llama.dll" target="runtimes\win-x64\native\llama.dll" />
<file src="runtimes/deps/avx/llama.dll" target="runtimes\win-x64\native\avx\llama.dll" />
<file src="runtimes/deps/avx2/llama.dll" target="runtimes\win-x64\native\avx2\llama.dll" />
<file src="runtimes/deps/avx512/llama.dll" target="runtimes\win-x64\native\avx512\llama.dll" />

<file src="runtimes/deps/libllama.so" target="runtimes\linux-x64\native\libllama.so" />
<file src="runtimes/deps/avx/libllama.so" target="runtimes\linux-x64\native\avx\libllama.so" />
<file src="runtimes/deps/avx2/libllama.so" target="runtimes\linux-x64\native\avx2\libllama.so" />
<file src="runtimes/deps/avx512/libllama.so" target="runtimes\linux-x64\native\avx512\libllama.so" />
<file src="runtimes/deps/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\libllama.so" />
<file src="runtimes/deps/avx/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\avx\libllama.so" />
<file src="runtimes/deps/avx2/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\avx2\libllama.so" />
<file src="runtimes/deps/avx512/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\avx512\libllama.so" />

<file src="runtimes/deps/osx-x64/libllama.dylib" target="runtimes\osx-x64\native\libllama.dylib" />
<file src="runtimes/deps/osx-arm64/libllama.dylib" target="runtimes\osx-arm64\native\libllama.dylib" />
<file src="runtimes/deps/osx-arm64/ggml-metal.metal" target="runtimes\osx-arm64\native\ggml-metal.metal" />
<file src="runtimes/deps/osx-x64/libllama.dylib" target="contentFiles\any\any\llama\osx-x64\native\libllama.dylib" />
<file src="runtimes/deps/osx-arm64/libllama.dylib" target="contentFiles\any\any\llama\osx-arm64\native\libllama.dylib" />
<file src="runtimes/deps/osx-arm64/ggml-metal.metal" target="contentFiles\any\any\llama\osx-arm64\native\ggml-metal.metal" />

<file src="runtimes/deps/llava_shared.dll" target="runtimes\win-x64\native\llava_shared.dll" />
<file src="runtimes/deps/avx/llava_shared.dll" target="runtimes\win-x64\native\avx\llava_shared.dll" />
<file src="runtimes/deps/avx2/llava_shared.dll" target="runtimes\win-x64\native\avx2\llava_shared.dll" />
<file src="runtimes/deps/avx512/llava_shared.dll" target="runtimes\win-x64\native\avx512\llava_shared.dll" />
<file src="runtimes/deps/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\llava_shared.dll" />
<file src="runtimes/deps/avx/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\avx\llava_shared.dll" />
<file src="runtimes/deps/avx2/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\avx2\llava_shared.dll" />
<file src="runtimes/deps/avx512/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\avx512\llava_shared.dll" />

<file src="runtimes/deps/libllava_shared.so" target="runtimes\linux-x64\native\libllava_shared.so" />
<file src="runtimes/deps/avx/libllava_shared.so" target="runtimes\linux-x64\native\avx\libllava_shared.so" />
<file src="runtimes/deps/avx2/libllava_shared.so" target="runtimes\linux-x64\native\avx2\libllava_shared.so" />
<file src="runtimes/deps/avx512/libllava_shared.so" target="runtimes\linux-x64\native\avx512\libllava_shared.so" />
<file src="runtimes/deps/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\libllava_shared.so" />
<file src="runtimes/deps/avx/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\avx\libllava_shared.so" />
<file src="runtimes/deps/avx2/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\avx2\libllava_shared.so" />
<file src="runtimes/deps/avx512/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\avx512\libllava_shared.so" />

<file src="runtimes/deps/osx-x64/libllava_shared.dylib" target="runtimes\osx-x64\native\libllava_shared.dylib" />
<file src="runtimes/deps/osx-arm64/libllava_shared.dylib" target="runtimes\osx-arm64\native\libllava_shared.dylib" />
<file src="runtimes/deps/osx-x64/libllava_shared.dylib" target="contentFiles\any\any\llama\osx-x64\native\libllava_shared.dylib" />
<file src="runtimes/deps/osx-arm64/libllava_shared.dylib" target="contentFiles\any\any\llama\osx-arm64\native\libllava_shared.dylib" />

<file src="icon512.png" target="icon512.png" />
</files>



</package>
13 changes: 8 additions & 5 deletions LLama/runtimes/build/LLamaSharp.Backend.Cuda11.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@
<releaseNotes></releaseNotes>
<copyright>Copyright 2023 The llama.cpp Authors. All rights reserved.</copyright>
<tags>LLamaSharp LLama LLM GPT AI ChatBot SciSharp</tags>
<contentFiles>
<files include="any\any\llama\**\*.*" buildAction="None" copyToOutput="true" />
</contentFiles>
</metadata>

<files>
<file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cuda11.props" />
<file src="LLamaSharpBackend.props" target="build/LLamaSharp.Backend.Cuda11.props" />

<file src="runtimes/deps/cu11.7.1/libllava_shared.so" target="runtimes\linux-x64\native\cuda11\libllava_shared.so" />
<file src="runtimes/deps/cu11.7.1/llava_shared.dll" target="runtimes\win-x64\native\cuda11\llava_shared.dll" />
<file src="runtimes/deps/cu11.7.1/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\cuda11\libllava_shared.so" />
<file src="runtimes/deps/cu11.7.1/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\cuda11\llava_shared.dll" />

<file src="runtimes/deps/cu11.7.1/llama.dll" target="runtimes\win-x64\native\cuda11\llama.dll" />
<file src="runtimes/deps/cu11.7.1/libllama.so" target="runtimes\linux-x64\native\cuda11\libllama.so" />
<file src="runtimes/deps/cu11.7.1/llama.dll" target="contentFiles\any\any\llama\win-x64\native\cuda11\llama.dll" />
<file src="runtimes/deps/cu11.7.1/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\cuda11\libllama.so" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
13 changes: 8 additions & 5 deletions LLama/runtimes/build/LLamaSharp.Backend.Cuda12.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@
<releaseNotes></releaseNotes>
<copyright>Copyright 2023 The llama.cpp Authors. All rights reserved.</copyright>
<tags>LLamaSharp LLama LLM GPT AI ChatBot SciSharp</tags>
<contentFiles>
<files include="any\any\llama\**\*.*" buildAction="None" copyToOutput="true" />
</contentFiles>
</metadata>

<files>
<file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cuda12.props" />
<file src="LLamaSharpBackend.props" target="build//LLamaSharp.Backend.Cuda12.props" />

<file src="runtimes/deps/cu12.1.0/libllava_shared.so" target="runtimes\linux-x64\native\cuda12\libllava_shared.so" />
<file src="runtimes/deps/cu12.1.0/llava_shared.dll" target="runtimes\win-x64\native\cuda12\llava_shared.dll" />
<file src="runtimes/deps/cu12.1.0/libllava_shared.so" target="contentFiles\any\any\llama\linux-x64\native\cuda12\libllava_shared.so" />
<file src="runtimes/deps/cu12.1.0/llava_shared.dll" target="contentFiles\any\any\llama\win-x64\native\cuda12\llava_shared.dll" />

<file src="runtimes/deps/cu12.1.0/llama.dll" target="runtimes\win-x64\native\cuda12\llama.dll" />
<file src="runtimes/deps/cu12.1.0/libllama.so" target="runtimes\linux-x64\native\cuda12\libllama.so" />
<file src="runtimes/deps/cu12.1.0/llama.dll" target="contentFiles\any\any\llama\win-x64\native\cuda12\llama.dll" />
<file src="runtimes/deps/cu12.1.0/libllama.so" target="contentFiles\any\any\llama\linux-x64\native\cuda12\libllama.so" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion LLama/runtimes/build/LLamaSharp.Backend.OpenCL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</metadata>

<files>
<file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.OpenCL.props" />
<file src="LLamaSharpBackend.props" target="build/LLamaSharp.Backend.OpenCL.props" />

<file src="runtimes/deps/clblast/libllava_shared.so" target="runtimes\linux-x64\native\clblast\libllava_shared.so" />
<file src="runtimes/deps/clblast/llava_shared.dll" target="runtimes\win-x64\native\clblast\llava_shared.dll" />
Expand Down