Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYCL] Fix broken build after introduction USM to ocl headers #1852

Merged
merged 2 commits into from
Jun 10, 2020
Merged

[SYCL] Fix broken build after introduction USM to ocl headers #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2c8b9
[SYCL] Fix broken build after introduction USM to ocl headers
againull Jun 9, 2020
efd4f5c
[SYCL] Remove enum value usages in cuda plugin
againull Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 0 additions & 186 deletions sycl/include/CL/cl_usm_ext.h
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions sycl/include/CL/sycl/detail/pi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
// elsewhere, e.g. in the pi_opencl, but constants/enums mapping is now
// done here, for efficiency and simplicity.
#include <CL/cl_ext_intel.h>
#include <CL/cl_usm_ext.h>
#include <CL/sycl/detail/cl.h>
#include <CL/sycl/detail/export.hpp>
#include <cstdint>
Expand Down Expand Up @@ -1340,8 +1339,6 @@ typedef enum {
PI_MEM_ALLOC_BASE_PTR = CL_MEM_ALLOC_BASE_PTR_INTEL,
PI_MEM_ALLOC_SIZE = CL_MEM_ALLOC_SIZE_INTEL,
PI_MEM_ALLOC_DEVICE = CL_MEM_ALLOC_DEVICE_INTEL,
PI_MEM_ALLOC_INFO_TBD0 = CL_MEM_ALLOC_INFO_TBD0_INTEL,
PI_MEM_ALLOC_INFO_TBD1 = CL_MEM_ALLOC_INFO_TBD1_INTEL,
} _pi_mem_info;

typedef enum {
Expand Down
5 changes: 0 additions & 5 deletions sycl/plugins/cuda/pi_cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,11 +3611,6 @@ pi_result cuda_piextUSMGetMemAllocInfo(pi_context context, const void *ptr,
return getInfo(param_value_size, param_value, param_value_size_ret,
device);
}
// not documented/implemented yet
case PI_MEM_ALLOC_INFO_TBD0:
case PI_MEM_ALLOC_INFO_TBD1: {
return PI_INVALID_VALUE;
}
}
} catch (pi_result error) {
result = error;
Expand Down