Skip to content

Fix issue #382 (multiple publish output files with same relative path) #1234

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix issue #382 (multiple publish output files with same relative path) #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ecbcea
fix runtimes copy, preserving runtimes folder structure
LucaMaccarini Aug 15, 2025
e65b01b
removed android runtimes manual copy
LucaMaccarini Aug 15, 2025
3fbef0e
commented android dll not present in 0.24.0
LucaMaccarini Aug 15, 2025
cb7de2e
Merge branch 'master' into fix-issue-#382
LucaMaccarini Aug 17, 2025
44a6085
improved issue solution in order to avoid extra installation step
LucaMaccarini Aug 17, 2025
57bafe1
fix starting path: replaced ../ in to runtimes/
LucaMaccarini Sep 9, 2025
2657f86
fix cuda and vulkan backends missing in output directory.
LucaMaccarini Sep 14, 2025
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,7 @@ site/
**/appsettings.Local.json
/LLama/runtimes/deps
/LLama/runtimes/deps.zip
/LLama/runtimes/release_id.txt
/LLama/runtimes/release_id.txt
/Llama.Mobile/Resources/Raw
/nuget_pack.bat
/temp
20 changes: 10 additions & 10 deletions LLama/runtimes/build/LLamaSharp.Backend.Cpu.Android.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
<files>
<file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cpu.Android.props" />

<file src="runtimes/deps/android-arm64-v8a/libllama.so" target="runtimes\android-arm64-v8a\native\libllama.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml.so" target="runtimes\android-arm64-v8a\native\libggml.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml-base.so" target="runtimes\android-arm64-v8a\native\libggml-base.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml-cpu.so" target="runtimes\android-arm64-v8a\native\libggml-cpu.so" />
<file src="runtimes/deps/android-arm64-v8a/libmtmd.so" target="runtimes\android-arm64-v8a\native\libmtmd.so" />
<file src="runtimes/deps/android-arm64-v8a/libllama.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libllama.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml-base.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml-base.so" />
<file src="runtimes/deps/android-arm64-v8a/libggml-cpu.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml-cpu.so" />
<file src="runtimes/deps/android-arm64-v8a/libmtmd.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libmtmd.so" />

<file src="runtimes/deps/android-x86_64/libllama.so" target="runtimes\android-x86_64\native\libllama.so" />
<file src="runtimes/deps/android-x86_64/libggml.so" target="runtimes\android-x86_64\native\libggml.so" />
<file src="runtimes/deps/android-x86_64/libggml-base.so" target="runtimes\android-x86_64\native\libggml-base.so" />
<file src="runtimes/deps/android-x86_64/libggml-cpu.so" target="runtimes\android-x86_64\native\libggml-cpu.so" />
<file src="runtimes/deps/android-x86_64/libmtmd.so" target="runtimes\android-x86_64\native\libmtmd.so" />
<file src="runtimes/deps/android-x86_64/libllama.so" target="LLamaSharpRuntimes\android-x86_64\native\libllama.so" />
<file src="runtimes/deps/android-x86_64/libggml.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml.so" />
<file src="runtimes/deps/android-x86_64/libggml-base.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml-base.so" />
<file src="runtimes/deps/android-x86_64/libggml-cpu.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml-cpu.so" />
<file src="runtimes/deps/android-x86_64/libmtmd.so" target="LLamaSharpRuntimes\android-x86_64\native\libmtmd.so" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
200 changes: 100 additions & 100 deletions LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</metadata>

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

<file src="runtimes/deps/cu12.4.0/libggml.so" target="runtimes/linux-x64/native/cuda12/libggml.so" />
<file src="runtimes/deps/cu12.4.0/libggml-base.so" target="runtimes/linux-x64/native/cuda12/libggml-base.so" />
<file src="runtimes/deps/cu12.4.0/libggml-cuda.so" target="runtimes/linux-x64/native/cuda12/libggml-cuda.so" />
<file src="runtimes/deps/cu12.4.0/libggml.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml.so" />
<file src="runtimes/deps/cu12.4.0/libggml-base.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml-base.so" />
<file src="runtimes/deps/cu12.4.0/libggml-cuda.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml-cuda.so" />

<file src="runtimes/deps/cu12.4.0/libllama.so" target="runtimes/linux-x64/native/cuda12/libllama.so" />
<file src="runtimes/deps/cu12.4.0/libmtmd.so" target="runtimes/linux-x64/native/cuda12/libmtmd.so" />
<file src="runtimes/deps/cu12.4.0/libllama.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libllama.so" />
<file src="runtimes/deps/cu12.4.0/libmtmd.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libmtmd.so" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
12 changes: 6 additions & 6 deletions LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Windows.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</metadata>

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

<file src="runtimes/deps/cu12.4.0/ggml.dll" target="runtimes\win-x64\native\cuda12\ggml.dll" />
<file src="runtimes/deps/cu12.4.0/ggml-base.dll" target="runtimes\win-x64\native\cuda12\ggml-base.dll" />
<file src="runtimes/deps/cu12.4.0/ggml-cuda.dll" target="runtimes\win-x64\native\cuda12\ggml-cuda.dll" />
<file src="runtimes/deps/cu12.4.0/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml.dll" />
<file src="runtimes/deps/cu12.4.0/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml-base.dll" />
<file src="runtimes/deps/cu12.4.0/ggml-cuda.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml-cuda.dll" />

<file src="runtimes/deps/cu12.4.0/llama.dll" target="runtimes\win-x64\native\cuda12\llama.dll" />
<file src="runtimes/deps/cu12.4.0/mtmd.dll" target="runtimes\win-x64\native\cuda12\mtmd.dll" />
<file src="runtimes/deps/cu12.4.0/llama.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\llama.dll" />
<file src="runtimes/deps/cu12.4.0/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\mtmd.dll" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
12 changes: 6 additions & 6 deletions LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</metadata>

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

<file src="runtimes/deps/vulkan/libggml.so" target="runtimes/linux-x64/native/vulkan/libggml.so" />
<file src="runtimes/deps/vulkan/libggml-base.so" target="runtimes/linux-x64/native/vulkan/libggml-base.so" />
<file src="runtimes/deps/vulkan/libggml-vulkan.so" target="runtimes/linux-x64/native/vulkan/libggml-vulkan.so" />
<file src="runtimes/deps/vulkan/libggml.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml.so" />
<file src="runtimes/deps/vulkan/libggml-base.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml-base.so" />
<file src="runtimes/deps/vulkan/libggml-vulkan.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml-vulkan.so" />

<file src="runtimes/deps/vulkan/libllama.so" target="runtimes/linux-x64/native/vulkan/libllama.so" />
<file src="runtimes/deps/vulkan/libmtmd.so" target="runtimes/linux-x64/native/vulkan/libmtmd.so" />
<file src="runtimes/deps/vulkan/libllama.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libllama.so" />
<file src="runtimes/deps/vulkan/libmtmd.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libmtmd.so" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
12 changes: 6 additions & 6 deletions LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Windows.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</metadata>

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

<file src="runtimes/deps/vulkan/ggml.dll" target="runtimes\win-x64\native\vulkan\ggml.dll" />
<file src="runtimes/deps/vulkan/ggml-base.dll" target="runtimes\win-x64\native\vulkan\ggml-base.dll" />
<file src="runtimes/deps/vulkan/ggml-vulkan.dll" target="runtimes\win-x64\native\vulkan\ggml-vulkan.dll" />
<file src="runtimes/deps/vulkan/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml.dll" />
<file src="runtimes/deps/vulkan/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml-base.dll" />
<file src="runtimes/deps/vulkan/ggml-vulkan.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml-vulkan.dll" />

<file src="runtimes/deps/vulkan/llama.dll" target="runtimes\win-x64\native\vulkan\llama.dll" />
<file src="runtimes/deps/vulkan/mtmd.dll" target="runtimes\win-x64\native\vulkan\mtmd.dll" />
<file src="runtimes/deps/vulkan/llama.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\llama.dll" />
<file src="runtimes/deps/vulkan/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\mtmd.dll" />

<file src="icon512.png" target="icon512.png" />
</files>
Expand Down
67 changes: 18 additions & 49 deletions LLama/runtimes/build/LLamaSharpBackend.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,42 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
<!--
NuGet packages.config doesn't support native assemblies automatically,
so copy the native assemblies to the output directory.
-->
<ItemGroup Condition="Exists('packages.config') OR
Exists('$(MSBuildProjectName).packages.config') OR
Exists('packages.$(MSBuildProjectName).config')">
<Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\**\*.*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Content>
</ItemGroup>

<!-- Start Android-->
<ItemGroup
Condition="$(AndroidSupportedAbis.Contains('x86')) or $(RuntimeIdentifiers.Contains('android-x86'))">
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libllama.so">
<Link>runtimes\android-x86\native\libllama.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml.so">
<Link>runtimes\android-x86\native\libggml.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml-base.so">
<Link>runtimes\android-x86\native\libggml-base.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml-cpu.so">
<Link>runtimes\android-x86\native\libggml-cpu.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libmtmd.so">
<Link>runtimes\android-x86\native\libmtmd.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
<ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\**\*.*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
<Link>runtimes\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Content>
</ItemGroup>

<!-- Start Android-->
<ItemGroup
Condition="$(AndroidSupportedAbis.Contains('x86_64')) or $(RuntimeIdentifiers.Contains('android-x64'))">
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libllama.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libllama.so">
<Link>lib\x86_64\libllama.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml.so">
<Link>lib\x86_64\libggml.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml-base.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml-base.so">
<Link>lib\x86_64\libggml-base.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml-cpu.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml-cpu.so">
<Link>lib\x86_64\libggml-cpu.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libmtmd.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libmtmd.so">
<Link>lib\x86_64\libmtmd.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
Expand All @@ -76,27 +45,27 @@
<ItemGroup
Condition="$(AndroidSupportedAbis.Contains('arm64-v8a')) or $(RuntimeIdentifiers.Contains('android-arm64'))">
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libllama.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libllama.so">
<Link>lib\arm64-v8a\libllama.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml.so">
<Link>lib\arm64-v8a\libggml.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml-base.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml-base.so">
<Link>lib\arm64-v8a\libggml-base.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml-cpu.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml-cpu.so">
<Link>lib\arm64-v8a\libggml-cpu.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
<AndroidNativeLibrary Visible="false"
Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libmtmd.so">
Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libmtmd.so">
<Link>lib\arm64-v8a\libmtmd.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
Expand Down