From: Diego Devesa Date: Tue, 26 Aug 2025 20:14:38 +0000 (-0700) Subject: tests : fix test-opt with GGML_BACKEND_DL (#15599) X-Git-Tag: upstream/0.0.6527~233 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=bcbddcd54f0d5c22eab180831fdea6484107112f;p=pkg%2Fggml%2Fsources%2Fllama.cpp tests : fix test-opt with GGML_BACKEND_DL (#15599) --- diff --git a/tests/test-opt.cpp b/tests/test-opt.cpp index 18d3fcf2..8dcb4a7d 100644 --- a/tests/test-opt.cpp +++ b/tests/test-opt.cpp @@ -3,7 +3,6 @@ #include "ggml.h" #include "ggml-alloc.h" #include "ggml-backend.h" -#include "ggml-cpu.h" #include "ggml-opt.h" #include @@ -899,6 +898,7 @@ static std::pair test_backend( int main(void) { ggml_log_set(nullptr, nullptr); + ggml_backend_load_all(); const size_t dev_count = ggml_backend_dev_count(); printf("Testing %zu devices\n\n", dev_count); size_t n_ok = 0; @@ -911,11 +911,12 @@ int main(void) { ggml_backend_t backend = ggml_backend_dev_init(devs[i], NULL); GGML_ASSERT(backend != NULL); -#ifndef _MSC_VER - if (ggml_backend_is_cpu(backend)) { - ggml_backend_cpu_set_n_threads(backend, std::thread::hardware_concurrency() / 2); + + auto * reg = ggml_backend_dev_backend_reg(devs[i]); + auto ggml_backend_set_n_threads_fn = (ggml_backend_set_n_threads_t) ggml_backend_reg_get_proc_address(reg, "ggml_backend_set_n_threads"); + if (ggml_backend_set_n_threads_fn) { + ggml_backend_set_n_threads_fn(backend, std::thread::hardware_concurrency() / 2); } -#endif backends.push_back(backend); }