From: AidanBeltonS <redacted>
Date: Fri, 15 Mar 2024 09:26:20 +0000 (+0000)
Subject: Fix non-intel device selection (llama/6042)
X-Git-Tag: upstream/0.0.1642~836
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=bbca4fd55939f6bd0326a62684e36a6a24c50c51;p=pkg%2Fggml%2Fsources%2Fggml

Fix non-intel device selection (llama/6042)

* Fix non-intel device selection

* Update ggml-sycl.cpp

Co-authored-by: Neo Zhang Jianyu <redacted>

* Update ggml-sycl.cpp

Co-authored-by: Neo Zhang Jianyu <redacted>

---------

Co-authored-by: Abhilash Majumder <redacted>
Co-authored-by: Neo Zhang Jianyu <redacted>
---

diff --git a/src/ggml-sycl.cpp b/src/ggml-sycl.cpp
index 9f650638..a1ca6aba 100644
--- a/src/ggml-sycl.cpp
+++ b/src/ggml-sycl.cpp
@@ -3451,7 +3451,7 @@ class sycl_gpu_mgr {
                 dpct::device_info prop;
                 dpct::get_device_info(prop, device);
                 if (max_compute_units == prop.get_max_compute_units() &&
-                    prop.get_major_version() == 1) {
+                    is_ext_oneapi_device(device)) {
                     gpus.push_back(id);
                     devices.push_back(device);
                     work_group_size = prop.get_max_work_group_size();
@@ -3484,6 +3484,15 @@ class sycl_gpu_mgr {
             assert(false);
             return -1;
         }
+
+        bool is_ext_oneapi_device(const sycl::device &dev) {
+            sycl::backend dev_backend = dev.get_backend();
+            if (dev_backend == sycl::backend::ext_oneapi_level_zero ||
+                dev_backend == sycl::backend::ext_oneapi_cuda ||
+                dev_backend == sycl::backend::ext_oneapi_hip)
+                return true;
+            return false;
+        }
 };
 
 static sycl_gpu_mgr *g_sycl_gpu_mgr = NULL;