Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-29 21:34:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

kompute : always destroy Manager via the destructor

Browse Source
This commit is contained in:
Jared Van Bortel 2023-12-15 16:23:24 -05:00
parent 2d2c76acc4
commit 8072706210
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ggml-kompute.cpp
View File

@ -63,17 +63,29 @@ struct ggml_kompute_context {
// and consolidate the init functions and simplify object lifetime management. As it currently stands, // and consolidate the init functions and simplify object lifetime management. As it currently stands,
// we *have* to have the kompute manager no matter what for device discovery, but the kompute context // we *have* to have the kompute manager no matter what for device discovery, but the kompute context
// is only created when a device is set and vulkan is explicitly turned on. // is only created when a device is set and vulkan is explicitly turned on.
ggml_kompute_context *s_kompute_context = nullptr; static ggml_kompute_context *s_kompute_context = nullptr;
static kp::Manager *komputeManager() {
static kp::Manager *s_mgr = nullptr; class kompute_manager {
if (s_mgr && !s_mgr->hasInstance()) { kp::Manager *s_mgr = nullptr;
public:
kp::Manager *operator()() {
if (s_mgr && !s_mgr->hasInstance()) {
destroy();
}
if (!s_mgr) {
s_mgr = new kp::Manager;
}
return s_mgr;
}
void destroy() {
delete s_mgr; delete s_mgr;
s_mgr = nullptr; s_mgr = nullptr;
} }
if (!s_mgr) };
s_mgr = new kp::Manager;
return s_mgr; static kompute_manager komputeManager;
}
#ifdef __linux__ #ifdef __linux__
__attribute__((constructor)) __attribute__((constructor))
@ -257,7 +269,7 @@ bool ggml_vk_init_device(int device) {
bool ggml_vk_free_device() { bool ggml_vk_free_device() {
if (!ggml_vk_has_device()) if (!ggml_vk_has_device())
return false; return false;
komputeManager()->destroy(); komputeManager.destroy();
// FIXME: The lifetime of these two needs to be tied together as we're relying upon the fact // FIXME: The lifetime of these two needs to be tied together as we're relying upon the fact
// the llama_free(ctx) destroys this memory and we just set the singleton to nullptr here which // the llama_free(ctx) destroys this memory and we just set the singleton to nullptr here which
// is very brittle // is very brittle