From: Georgi Gerganov <redacted>
Date: Thu, 3 Oct 2024 19:03:05 +0000 (+0300)
Subject: cont : fixes
X-Git-Tag: upstream/0.0.1642~310
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=423328034b92a45523d4fde7610e2948b1ceebd0;p=pkg%2Fggml%2Fsources%2Fggml

cont : fixes
---

diff --git a/examples/mnist/mnist-common.h b/examples/mnist/mnist-common.h
index 0a88f05d..37531b28 100644
--- a/examples/mnist/mnist-common.h
+++ b/examples/mnist/mnist-common.h
@@ -57,8 +57,8 @@ struct mnist_model {
     ggml_backend_buffer_t buf_compute = nullptr;
 
     mnist_model(const std::string & backend_name) {
-        const ggml_backend_reg_t reg = ggml_backend_reg_by_name(backend_name.c_str());
-        if (reg == nullptr) {
+        const ggml_backend_dev_t dev = ggml_backend_dev_by_name(backend_name.c_str());
+        if (dev == nullptr) {
             fprintf(stderr, "%s: ERROR: backend %s not found, available:\n", __func__, backend_name.c_str());
             for (size_t i = 0; i < ggml_backend_reg_count(); ++i) {
                 fprintf(stderr, "  - %s\n", ggml_backend_reg_name(ggml_backend_reg_get(i)));
@@ -68,7 +68,7 @@ struct mnist_model {
 
         fprintf(stderr, "%s: using %s backend\n", __func__, backend_name.c_str());
 
-        ggml_backend_t backend = ggml_backend_init_by_name(backend_name.c_str(), NULL);
+        ggml_backend_t backend = ggml_backend_dev_init(dev, NULL);
         if (ggml_backend_is_cpu(backend)) {
             const int ncores_logical = std::thread::hardware_concurrency();
             ggml_backend_cpu_set_n_threads(backend, std::min(ncores_logical, (ncores_logical + 4)/2));
diff --git a/tests/test-backend-buffer.cpp b/tests/test-backend-buffer.cpp
index cd53358c..09f46e8b 100644
--- a/tests/test-backend-buffer.cpp
+++ b/tests/test-backend-buffer.cpp
@@ -67,10 +67,12 @@ int main() {
     printf("Testing %zu backends\n\n", ggml_backend_reg_count());
 
     for (size_t i = 0; i < ggml_backend_reg_count(); i++) {
-        const char * name = ggml_backend_reg_name(ggml_backend_reg_get(i));
-        printf("Backend %zu/%zu (%s)\n", i + 1, ggml_backend_reg_count(), name);
+        ggml_backend_reg_t reg = ggml_backend_reg_get(i);
+        const char * reg_name = ggml_backend_reg_name(reg);
+        printf("Backend %zu/%zu (%s)\n", i + 1, ggml_backend_reg_count(), reg_name);
 
-        ggml_backend_t backend = ggml_backend_init_by_name(name, NULL);
+        const ggml_backend_dev_t dev = ggml_backend_reg_dev_get(reg, 0);
+        ggml_backend_t backend = ggml_backend_dev_init(dev, NULL);
         GGML_ASSERT(backend != NULL);
         printf("  Backend name: %s\n", ggml_backend_name(backend));