mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2025-09-10 09:04:36 +00:00
Merge remote-tracking branch 'occam/opencl-dev' into concedo_experimental
# Conflicts: # .github/workflows/build.yml # CMakeLists.txt # Makefile # README.md # ggml-opencl.cpp # llama.cpp # otherarch/ggml_v2-opencl-legacy.c
This commit is contained in:
commit
981d5ba866
14 changed files with 941 additions and 321 deletions
|
@ -51,14 +51,14 @@ extern "C"
|
|||
//first digit is whether configured, second is platform, third is devices
|
||||
int parseinfo = inputs.clblast_info;
|
||||
|
||||
std::string usingclblast = "GGML_CLBLAST_CONFIGURED="+std::to_string(parseinfo>0?1:0);
|
||||
std::string usingclblast = "GGML_OPENCL_CONFIGURED="+std::to_string(parseinfo>0?1:0);
|
||||
putenv((char*)usingclblast.c_str());
|
||||
|
||||
parseinfo = parseinfo%100; //keep last 2 digits
|
||||
int platform = parseinfo/10;
|
||||
int devices = parseinfo%10;
|
||||
platformenv = "GGML_CLBLAST_PLATFORM="+std::to_string(platform);
|
||||
deviceenv = "GGML_CLBLAST_DEVICE="+std::to_string(devices);
|
||||
platformenv = "GGML_OPENCL_PLATFORM="+std::to_string(platform);
|
||||
deviceenv = "GGML_OPENCL_DEVICE="+std::to_string(devices);
|
||||
putenv((char*)platformenv.c_str());
|
||||
putenv((char*)deviceenv.c_str());
|
||||
executable_path = inputs.executable_path;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue