Skip to content

Commit 2b66d72

Browse files
Nuullllkbenzie
authored andcommitted
Update header to include new enums from cl_khr_command_buffer (#18820)
`cl_khr_command_buffer` symbols changed by KhronosGroup/OpenCL-Headers#265 Uplift OpenCL-Headers to KhronosGroup/OpenCL-Headers@60ba29d and OpenCL-ICD-Loader to KhronosGroup/OpenCL-ICD-Loader@ddf6c70 The latest header also requires to explicitly enable `CL_ENABLE_BETA_EXTENSIONS` for beta extensions like `cl_khr_command_buffer`.
1 parent 7fd5ecb commit 2b66d72

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

source/adapters/opencl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if(UR_OPENCL_INCLUDE_DIR)
5757
else()
5858
FetchContent_Declare(OpenCL-Headers
5959
GIT_REPOSITORY "https://github.com/KhronosGroup/OpenCL-Headers.git"
60-
GIT_TAG 542d7a8f65ecfd88b38de35d8b10aa67b36b33b2
60+
GIT_TAG 60ba29d8117b5f81d6ab294fa62d9b6688d83f4e
6161
)
6262
FetchContent_MakeAvailable(OpenCL-Headers)
6363
FetchContent_GetProperties(OpenCL-Headers

source/adapters/opencl/command_buffer.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//===----------------------------------------------------------------------===//
1010

1111
#include "common.hpp"
12-
#include <CL/cl_ext.h>
1312
#include <ur/ur.hpp>
1413

1514
/// Handle to a kernel command.

source/adapters/opencl/common.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
//===-----------------------------------------------------------------===//
88
#pragma once
99

10+
// Include symbols for beta extensions
11+
#ifndef CL_ENABLE_BETA_EXTENSIONS
12+
#define CL_ENABLE_BETA_EXTENSIONS
13+
#endif
14+
1015
#include <CL/cl.h>
1116
#include <CL/cl_ext.h>
1217
#include <climits>

test/conformance/exp_command_buffer/native-command/append_native_opencl.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66

77
#include "common.h"
8+
9+
// Include symbols for beta extensions
10+
#ifndef CL_ENABLE_BETA_EXTENSIONS
11+
#define CL_ENABLE_BETA_EXTENSIONS
12+
#endif
13+
814
#include <CL/cl_ext.h>
915

1016
// Test using using OpenCL cl_khr_command_buffer to add commands to a native

0 commit comments

Comments
 (0)