Skip to content

Commit 93a2977

Browse files
authored
[SYCL] use release version of OpenCL ICD loader
Windows build failure is introduced in remote repository impacting our CI (KhronosGroup/OpenCL-ICD-Loader@97f0eb5). Make our CI to use release version of OpenCL ICD loader to avoid catching non-product failures in CI.
1 parent 7b4672d commit 93a2977

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

buildbot/dependency.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ def do_dependency(args):
5858
# fetch and build OpenCL ICD loader
5959
icd_loader_dir = os.path.join(args.obj_dir, "OpenCL-ICD-Loader")
6060
if not os.path.isdir(icd_loader_dir):
61-
clone_cmd = ["git", "clone", "https://github.com/KhronosGroup/OpenCL-ICD-Loader", "OpenCL-ICD-Loader"]
61+
clone_cmd = ["git", "clone",
62+
"https://github.com/KhronosGroup/OpenCL-ICD-Loader",
63+
"OpenCL-ICD-Loader", "-b", "v2020.06.16"]
64+
6265
subprocess.check_call(clone_cmd, cwd=args.obj_dir)
6366
else:
6467
fetch_cmd = ["git", "pull", "--ff", "--ff-only", "origin"]

opencl-aot/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if (NOT OpenCL_LIBRARIES)
4848
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/icd_build)
4949
ExternalProject_Add(opencl-icd
5050
GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
51-
GIT_TAG origin/master
51+
GIT_TAG v2020.06.16
5252
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd"
5353
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icd_build"
5454
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ if( NOT OpenCL_LIBRARIES )
144144
endif()
145145
ExternalProject_Add(ocl-icd
146146
GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
147-
GIT_TAG origin/master
147+
GIT_TAG v2020.06.16
148148
UPDATE_DISCONNECTED ${SYCL_EP_OCL_ICD_SKIP_AUTO_UPDATE}
149149
SOURCE_DIR ${OpenCL_ICD_LOADER_SOURCE_DIR}
150150
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icd_build"

0 commit comments

Comments
 (0)