vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-10 17:14:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'vulkan_test' into concedo_experimental

Browse source 
# Conflicts:
#	CMakeLists.txt
#	Makefile
#	llama.cpp
This commit is contained in:
Concedo 2024-01-25 23:01:44 +08:00
commit 2a4a7241e6
117 changed files with 394082 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

7
expose.cpp
View file

@ -23,7 +23,7 @@
extern "C"
{
std::string platformenv, deviceenv;
std::string platformenv, deviceenv, vulkandeviceenv;
//return val: 0=fail, 1=(original ggml, alpaca), 2=(ggmf), 3=(ggjt)
static FileFormat file_format = FileFormat::BADFORMAT;
@ -58,6 +58,11 @@ extern "C"
deviceenv = "GGML_OPENCL_DEVICE="+std::to_string(devices);
putenv((char*)platformenv.c_str());
putenv((char*)deviceenv.c_str());
int vulkan_info = inputs.vulkan_info;
vulkandeviceenv = "GGML_VULKAN_DEVICE="+std::to_string(vulkan_info);
putenv((char*)vulkandeviceenv.c_str());
executable_path = inputs.executable_path;
if(file_format==FileFormat::GPTJ_1 || file_format==FileFormat::GPTJ_2 || file_format==FileFormat::GPTJ_3 || file_format==FileFormat::GPTJ_4 || file_format==FileFormat::GPTJ_5)