Browse Source

Added `native/` back into path prefix

tags/v0.8.1
Martin Evans 2 years ago
parent
commit
a3614f6747
2 changed files with 19 additions and 19 deletions
  1. +15
    -15
      LLama/LLamaSharp.Runtime.targets
  2. +4
    -4
      LLama/Native/NativeApi.Load.cs

+ 15
- 15
LLama/LLamaSharp.Runtime.targets View File

@@ -6,66 +6,66 @@


<None Include="$(MSBuildThisFileDirectory)runtimes/deps/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/noavx/libllama.dll</Link>
<Link>runtimes/win-x64/native/noavx/libllama.dll</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/avx/libllama.dll</Link>
<Link>runtimes/win-x64/native/avx/libllama.dll</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx2/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx2/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/avx2/libllama.dll</Link>
<Link>runtimes/win-x64/native/avx2/libllama.dll</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx512/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx512/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/avx512/libllama.dll</Link>
<Link>runtimes/win-x64/native/avx512/libllama.dll</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu11.7.1/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu11.7.1/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/cuda11/libllama.dll</Link>
<Link>runtimes/win-x64/native/cuda11/libllama.dll</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu12.1.0/libllama.dll"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu12.1.0/libllama.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/win-x64/cuda12/libllama.dll</Link>
<Link>runtimes/win-x64/native/cuda12/libllama.dll</Link>
</None> </None>


<None Include="$(MSBuildThisFileDirectory)runtimes/deps/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/noavx/libllama.so</Link>
<Link>runtimes/linux-x64/native/noavx/libllama.so</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/avx/libllama.so</Link>
<Link>runtimes/linux-x64/native/avx/libllama.so</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx2/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx2/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/avx2/libllama.so</Link>
<Link>runtimes/linux-x64/native/avx2/libllama.so</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx512/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/avx512/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/avx512/libllama.so</Link>
<Link>runtimes/linux-x64/native/avx512/libllama.so</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu11.7.1/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu11.7.1/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/cuda11/libllama.so</Link>
<Link>runtimes/linux-x64/native/cuda11/libllama.so</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu12.1.0/libllama.so"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/cu12.1.0/libllama.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/linux-x64/cuda12/libllama.so</Link>
<Link>runtimes/linux-x64/native/cuda12/libllama.so</Link>
</None> </None>


<None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-arm64/libllama.dylib"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-arm64/libllama.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/osx-arm64/libllama.dylib</Link>
<Link>runtimes/osx-arm64/native/libllama.dylib</Link>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-arm64/ggml-metal.metal"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-arm64/ggml-metal.metal">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/osx-arm64/ggml-metal.metal</Link>
<Link>runtimes/osx-arm64/native/ggml-metal.metal</Link>
</None> </None>


<None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-x64/libllama.dylib"> <None Include="$(MSBuildThisFileDirectory)runtimes/deps/osx-x64/libllama.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes/osx-x64/libllama.dylib</Link>
<Link>runtimes/osx-x64/native/libllama.dylib</Link>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 4
- 4
LLama/Native/NativeApi.Load.cs View File

@@ -155,13 +155,13 @@ namespace LLama.Native
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
platform = OSPlatform.Windows; platform = OSPlatform.Windows;
prefix = "runtimes/win-x64/";
prefix = "runtimes/win-x64/native/";
suffix = ".dll"; suffix = ".dll";
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{ {
platform = OSPlatform.Linux; platform = OSPlatform.Linux;
prefix = "runtimes/linux-x64/";
prefix = "runtimes/linux-x64/native/";
suffix = ".so"; suffix = ".so";
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -170,11 +170,11 @@ namespace LLama.Native
suffix = ".dylib"; suffix = ".dylib";
if (System.Runtime.Intrinsics.Arm.ArmBase.Arm64.IsSupported) if (System.Runtime.Intrinsics.Arm.ArmBase.Arm64.IsSupported)
{ {
prefix = "runtimes/osx-arm64/";
prefix = "runtimes/osx-arm64/native/";
} }
else else
{ {
prefix = "runtimes/osx-x64/";
prefix = "runtimes/osx-x64/native/";
} }
} }
else else


Loading…
Cancel
Save