feat: 更新依赖版本，增加 Vulkan

sangyuxiaowu · Jul 17, 2024 · 36e72fe · 36e72fe
1 parent e70a588
commit 36e72fe
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,7 +14,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(MSBuildProjectName.Contains('LLamaWorker.Backend'))">
-		<PackageReference Include="LLamaSharp" Version="0.13.0" />
+		<PackageReference Include="LLamaSharp" Version="0.14.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
 		<ProjectReference Include="..\LLamaWorker.OpenAIModels\LLamaWorker.OpenAIModels.csproj" />
 		<Compile Include="..\src\**\*.cs" />

diff --git a/LLamaWorker.Backend.Cpu/LLamaWorker.Backend.Cpu.csproj b/LLamaWorker.Backend.Cpu/LLamaWorker.Backend.Cpu.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.13.0" />
+    <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.14.0" />
   </ItemGroup>
 
 </Project>
diff --git a/LLamaWorker.Backend.Cuda11/LLamaWorker.Backend.Cuda11.csproj b/LLamaWorker.Backend.Cuda11/LLamaWorker.Backend.Cuda11.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="LLamaSharp.Backend.Cuda11" Version="0.13.0" />
+    <PackageReference Include="LLamaSharp.Backend.Cuda11" Version="0.14.0" />
   </ItemGroup>
 
 </Project>
diff --git a/LLamaWorker.Backend.Cuda12/LLamaWorker.Backend.Cuda12.csproj b/LLamaWorker.Backend.Cuda12/LLamaWorker.Backend.Cuda12.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="LLamaSharp.Backend.Cuda12" Version="0.13.0" />
+    <PackageReference Include="LLamaSharp.Backend.Cuda12" Version="0.14.0" />
   </ItemGroup>
 
 </Project>
diff --git a/LLamaWorker.Backend.Vulkan/LLamaWorker.Backend.Vulkan.csproj b/LLamaWorker.Backend.Vulkan/LLamaWorker.Backend.Vulkan.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+	<ItemGroup>
+		<PackageReference Include="LLamaSharp.Backend.Vulkan" Version="0.14.0" />
+	</ItemGroup>
+
+</Project>
diff --git a/LLamaWorker.Backend.Vulkan/Properties/launchSettings.json b/LLamaWorker.Backend.Vulkan/Properties/launchSettings.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:64031",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5114",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/LLamaWorker.sln b/LLamaWorker.sln
@@ -21,7 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LLamaWorker.Backend.Cuda12"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatUI", "ChatUI\ChatUI.csproj", "{DC93E608-24D7-4D62-9EAA-37DED72BD1C4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLamaWorker.OpenAIModels", "LLamaWorker.OpenAIModels\LLamaWorker.OpenAIModels.csproj", "{AD025766-1079-4EA5-94DD-AA9A96EC8173}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LLamaWorker.OpenAIModels", "LLamaWorker.OpenAIModels\LLamaWorker.OpenAIModels.csproj", "{AD025766-1079-4EA5-94DD-AA9A96EC8173}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLamaWorker.Backend.Vulkan", "LLamaWorker.Backend.Vulkan\LLamaWorker.Backend.Vulkan.csproj", "{DE6EAA14-0D69-4D43-A502-6BCADC41C13E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,6 +51,10 @@ Global
 		{AD025766-1079-4EA5-94DD-AA9A96EC8173}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD025766-1079-4EA5-94DD-AA9A96EC8173}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD025766-1079-4EA5-94DD-AA9A96EC8173}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE6EAA14-0D69-4D43-A502-6BCADC41C13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE6EAA14-0D69-4D43-A502-6BCADC41C13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE6EAA14-0D69-4D43-A502-6BCADC41C13E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE6EAA14-0D69-4D43-A502-6BCADC41C13E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ English | [中文](README_CN.md)
    - `LLamaWorker.Backend.Cpu`: For CPU environments.
    - `LLamaWorker.Backend.Cuda11`: For GPU environments with CUDA 11.
    - `LLamaWorker.Backend.Cuda12`: For GPU environments with CUDA 12.
+   - `LLamaWorker.Backend.Vulkan`: Vulkan. 
 
    Select the project file that suits your environment for the next step.
 

diff --git a/README_CN.md b/README_CN.md
@@ -30,7 +30,8 @@ LLamaWorker 是一个基于 [LLamaSharp](https://github.com/SciSharp/LLamaSharp?
 3. 根据您的需求选择项目文件。项目提供了三个版本的项目文件：
    - `LLamaWorker.Backend.Cpu`：适用于 CPU 环境。
    - `LLamaWorker.Backend.Cuda11`：适用于搭载 CUDA 11 的 GPU 环境。
-   - `LLamaWorker.Backend.Cuda12`：适用于搭载 CUDA 12 的 GPU 环境。
+   - `LLamaWorker.Backend.Cuda12`：适用于搭载 CUDA 12 的 GPU 环境。                                                                                                      
+   - `LLamaWorker.Backend.Vulkan`：Vulkan 方案。
 
    选择适合您环境的项目文件进行下一步。