vulkan env var always take priority

This commit is contained in:
Concedo 2026-01-17 10:34:45 +08:00
parent 8855a7f52b
commit d2b2224b0d
5 changed files with 10 additions and 5 deletions

View file

@ -60,7 +60,8 @@ extern "C"
vulkan_info_str += ",";
}
}
if(vulkan_info_str!="")
const char* existingenv = getenv("GGML_VK_VISIBLE_DEVICES");
if(!existingenv && vulkan_info_str!="")
{
vulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+vulkan_info_str;
putenv((char*)vulkandeviceenv.c_str());

View file

@ -101,7 +101,8 @@ bool embeddingstype_load_model(const embeddings_load_model_inputs inputs)
vulkan_info_str += ",";
}
}
if(vulkan_info_str!="")
const char* existingenv = getenv("GGML_VK_VISIBLE_DEVICES");
if(!existingenv && vulkan_info_str!="")
{
ttsvulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+vulkan_info_str;
putenv((char*)ttsvulkandeviceenv.c_str());

View file

@ -303,7 +303,8 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) {
vulkan_info_str += ",";
}
}
if(vulkan_info_str!="")
const char* existingenv = getenv("GGML_VK_VISIBLE_DEVICES");
if(!existingenv && vulkan_info_str!="")
{
sdvulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+vulkan_info_str;
putenv((char*)sdvulkandeviceenv.c_str());

View file

@ -636,7 +636,8 @@ bool ttstype_load_model(const tts_load_model_inputs inputs)
vulkan_info_str += ",";
}
}
if(vulkan_info_str!="")
const char* existingenv = getenv("GGML_VK_VISIBLE_DEVICES");
if(!existingenv && vulkan_info_str!="")
{
ttsvulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+vulkan_info_str;
putenv((char*)ttsvulkandeviceenv.c_str());

View file

@ -95,7 +95,8 @@ bool whispertype_load_model(const whisper_load_model_inputs inputs)
vulkan_info_str += ",";
}
}
if(vulkan_info_str!="")
const char* existingenv = getenv("GGML_VK_VISIBLE_DEVICES");
if(!existingenv && vulkan_info_str!="")
{
whispervulkandeviceenv = "GGML_VK_VISIBLE_DEVICES="+vulkan_info_str;
putenv((char*)whispervulkandeviceenv.c_str());