Skip to content

Commit 9673e05

Browse files
authored
[SYCL] Update OpenCL-ICD dependency to let it build with MinGW (#7864)
MinGW doesn't provide 'windows.management.deployment.h', which made compilation much more difficult. See upstream commit: KhronosGroup/OpenCL-ICD-Loader@4aa6837 This patch has been split from #7859 after a discusion: >>Could you please clarify why uplift of ocl loader version is required? > The reason is this upstream commit: KhronosGroup/OpenCL-ICD-Loader@4aa6837 >It refactors 'apppackage' driver loader from WinRT API to raw WinAPI. The problem was that this specific WinRT API was not present in MinGW, so it would need extra work to make it compile. Upstream update just lets avoiding this extra work. >I took the tip of the master for an update, but I believe any commit starting with KhronosGroup/OpenCL-ICD-Loader@4aa6837 should be enough to fix the issue.
1 parent efe1074 commit 9673e05

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildbot/dependency.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def do_dependency(args):
7575

7676
# Checkout fixed version to avoid unexpected issues coming from upstream
7777
# Specific version can be uplifted as soon as such need arise
78-
checkout_cmd = ["git", "checkout", "5f8249691ec8c25775789498951f8e9eb62c201d"]
78+
checkout_cmd = ["git", "checkout", "9a3e962f16f5097d2054233ad8b6dad51b6f41b7"]
7979
subprocess.check_call(checkout_cmd, cwd=icd_loader_dir)
8080

8181
icd_build_dir = os.path.join(icd_loader_dir, "build")

opencl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(OCL_LOADER_REPO
2121
# Repo tags/hashes
2222

2323
set(OCL_HEADERS_TAG dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
24-
set(OCL_LOADER_TAG 792682ad3d877ab38573b997808bab3b43902b70)
24+
set(OCL_LOADER_TAG 9a3e962f16f5097d2054233ad8b6dad51b6f41b7)
2525

2626
# OpenCL Headers
2727
if(NOT OpenCL_HEADERS)

0 commit comments

Comments
 (0)