From 9712b4be2352fa86a2cc2d700361a325ad57d6f8 Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Fri, 12 Apr 2024 11:37:37 +0000
Subject: [PATCH] Use a generic OpenCL ICD loader.

---
 Project.toml  | 1 +
 src/oneAPI.jl | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 4b1116d0..b89bfeb7 100644
--- a/Project.toml
+++ b/Project.toml
@@ -14,6 +14,7 @@ LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 NEO_jll = "700fe977-ac61-5f37-bbc8-c6c4b2b6a9fd"
+OpenCL_jll = "6cb37087-e8b6-5417-8430-1f242f1e46e4"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
diff --git a/src/oneAPI.jl b/src/oneAPI.jl
index b0da0823..da3f6992 100644
--- a/src/oneAPI.jl
+++ b/src/oneAPI.jl
@@ -15,6 +15,7 @@ using LLVM
 using LLVM.Interop
 using Core: LLVMPtr
 
+using OpenCL_jll
 using SPIRV_LLVM_Translator_unified_jll, SPIRV_Tools_jll
 
 export oneL0
@@ -84,9 +85,9 @@ function __init__()
                  For the time being, it is recommended to use WSL or Linux instead."""
     end
 
-    if Sys.islinux()
-        # ensure that the OpenCL runtime dispatcher finds the ICD files from our artifacts
-        ENV["OCL_ICD_VENDORS"] = oneL0.NEO_jll.libigdrcl
+    if oneL0.NEO_jll.is_available()
+        # ensure that the OpenCL loader finds the ICD files from our artifacts
+        ENV["OCL_ICD_FILENAMES"] = oneL0.NEO_jll.libigdrcl
     end
 end