fix merge
Some checks failed
flake8 Lint / Lint (push) Has been cancelled

This commit is contained in:
slaren 2024-10-07 01:10:35 +02:00
parent 6dcb899170
commit b150ffad41

View File

@ -1206,19 +1206,19 @@ static const struct ggml_backend_device_i ggml_backend_cpu_device_i = {
//////////////////////// ////////////////////////
static const char * ggml_backend_cpu_reg_name(ggml_backend_reg_t reg) { static const char * ggml_backend_cpu_reg_get_name(ggml_backend_reg_t reg) {
return "CPU"; return "CPU";
GGML_UNUSED(reg); GGML_UNUSED(reg);
} }
static size_t ggml_backend_cpu_reg_device_count(ggml_backend_reg_t reg) { static size_t ggml_backend_cpu_reg_get_device_count(ggml_backend_reg_t reg) {
return 1; return 1;
GGML_UNUSED(reg); GGML_UNUSED(reg);
} }
static ggml_backend_dev_t ggml_backend_cpu_reg_device_get(ggml_backend_reg_t reg, size_t index) { static ggml_backend_dev_t ggml_backend_cpu_reg_get_device(ggml_backend_reg_t reg, size_t index) {
GGML_ASSERT(index == 0); GGML_ASSERT(index == 0);
static ggml_backend_cpu_device_context ctx; static ggml_backend_cpu_device_context ctx;
@ -1235,9 +1235,9 @@ static ggml_backend_dev_t ggml_backend_cpu_reg_device_get(ggml_backend_reg_t reg
} }
static const struct ggml_backend_reg_i ggml_backend_cpu_reg_i = { static const struct ggml_backend_reg_i ggml_backend_cpu_reg_i = {
/* .get_name = */ ggml_backend_cpu_reg_name, /* .get_name = */ ggml_backend_cpu_reg_get_name,
/* .device_count = */ ggml_backend_cpu_reg_device_count, /* .get_device_count = */ ggml_backend_cpu_reg_get_device_count,
/* .device_get = */ ggml_backend_cpu_reg_device_get, /* .get_device = */ ggml_backend_cpu_reg_get_device,
/* .get_proc_address = */ NULL, /* .get_proc_address = */ NULL,
}; };