Skip to content

Commit 67b9aa2

Browse files
committed
Use PoCL for Linux Intel SYCL CI
1 parent 5ad553c commit 67b9aa2

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,6 @@ if(ITLABAI_ENABLE_SYCL)
9494
target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE
9595
-fsycl-targets=${ITLABAI_SYCL_TARGETS}
9696
)
97-
98-
if(ITLABAI_SYCL_TARGETS MATCHES "(^|,)native_cpu(,|$)")
99-
target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
100-
$<$<COMPILE_LANGUAGE:CXX>:-fno-sycl-libspirv>
101-
)
102-
target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE
103-
-fno-sycl-libspirv
104-
)
105-
endif()
10697
endif()
10798
endfunction()
10899
else()

scripts/ci/sycl_x86_setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def configure_platform(platform: str) -> None:
2525
settings = {
2626
"linux-x86_64": {
2727
"toolchain_asset": "sycl_linux.tar.gz",
28-
"device_selector": "native_cpu:cpu",
28+
"device_selector": "opencl:cpu",
2929
"opencv_apps": "ON",
30-
"sycl_targets": "native_cpu",
30+
"sycl_targets": "spir64",
3131
},
3232
"windows-x86_64": {
3333
"toolchain_asset": "sycl_windows.tar.gz",
@@ -62,6 +62,7 @@ def setup_linux_runtime() -> None:
6262
"git",
6363
"ocl-icd-opencl-dev",
6464
"opencl-headers",
65+
"pocl-opencl-icd",
6566
"python3",
6667
"zstd",
6768
]
@@ -103,7 +104,6 @@ def setup_linux_runtime() -> None:
103104
"install",
104105
"-y",
105106
"intel-oneapi-compiler-dpcpp-cpp",
106-
"intel-oneapi-runtime-opencl",
107107
]
108108
)
109109

@@ -115,14 +115,14 @@ def setup_linux_runtime() -> None:
115115
icd_file = None
116116
for candidate in Path("/etc/OpenCL/vendors").glob("*.icd"):
117117
try:
118-
if "intel" in candidate.read_text(encoding="utf-8").lower():
118+
if "pocl" in candidate.read_text(encoding="utf-8").lower():
119119
icd_file = candidate
120120
break
121121
except OSError:
122122
continue
123123

124124
if icd_file is None:
125-
main_error("Unable to locate Intel OpenCL ICD file under /etc/OpenCL/vendors")
125+
main_error("Unable to locate PoCL OpenCL ICD file under /etc/OpenCL/vendors")
126126

127127
run(["cp", str(icd_file), str(icd_dir / icd_file.name)])
128128
write_env("OCL_ICD_VENDORS", str(icd_dir))

0 commit comments

Comments
 (0)