Merge branch 'master' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	Makefile
#	README.md
#	flake.lock
#	llama.cpp
This commit is contained in:
Concedo 2024-02-07 22:21:32 +08:00
commit ec2dbd99a3
21 changed files with 2614 additions and 1863 deletions

View file

@ -60,7 +60,7 @@ extern "C"
putenv((char*)deviceenv.c_str());
int vulkan_info = inputs.vulkan_info;
vulkandeviceenv = "GGML_VULKAN_DEVICE="+std::to_string(vulkan_info);
vulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+std::to_string(vulkan_info);
putenv((char*)vulkandeviceenv.c_str());
executable_path = inputs.executable_path;