vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ggml/kompute: Remove unused ggml_backend_kompute_device_{ref, unref}()

Browse source 
Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
This commit is contained in:
Feng Jiang 2024-08-21 16:41:26 +08:00
parent f57f8cb3da
commit cc9514f941
1 changed files with 0 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ggml/src/ggml-kompute.cpp
View file

@ -79,12 +79,6 @@ struct ggml_backend_kompute_context {
: device(device), name(ggml_kompute_format_name(device)) { buft.context = nullptr; } : device(device), name(ggml_kompute_format_name(device)) { buft.context = nullptr; }
}; };
// FIXME: It would be good to consolidate the kompute manager and the kompute context into one object
// 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
// is only created when a device is set and vulkan is explicitly turned on.
static ggml_backend_kompute_context *s_kompute_context = nullptr;
struct ggml_backend_kompute_buffer_type_context { struct ggml_backend_kompute_buffer_type_context {
int device; int device;
@ -1853,35 +1847,6 @@ kp::TensorT<uint8_t>::dataType()
// backend interface // backend interface
static void ggml_backend_kompute_device_ref(ggml_backend_buffer_type_t buft) {
auto * ctx = static_cast<ggml_backend_kompute_buffer_type_context *>(buft->context);
if (!ctx->device_ref) {
s_kompute_context->manager.initializeDevice(
ctx->device, {}, {
"VK_KHR_shader_float16_int8", "VK_KHR_8bit_storage",
"VK_KHR_16bit_storage", "VK_KHR_shader_non_semantic_info"
}
);
}
assert(ggml_vk_has_device(s_kompute_context));
ctx->device_ref++;
}
static void ggml_backend_kompute_device_unref(ggml_backend_buffer_type_t buft) {
auto * ctx = static_cast<ggml_backend_kompute_buffer_type_context *>(buft->context);
assert(ctx->device_ref > 0);
ctx->device_ref--;
if (!ctx->device_ref) {
s_kompute_context->manager.destroy();
}
}
static const char * ggml_backend_kompute_buffer_get_name(ggml_backend_buffer_t buffer) { static const char * ggml_backend_kompute_buffer_get_name(ggml_backend_buffer_t buffer) {
auto * ctx = static_cast<ggml_backend_kompute_buffer_type_context *>(buffer->buft->context); auto * ctx = static_cast<ggml_backend_kompute_buffer_type_context *>(buffer->buft->context);
return ctx->name.c_str(); return ctx->name.c_str();