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

Signed-off-by: Artur Gainullin <artur.gainullin@intel.com>
intel · Jun 10, 2020 · 4a8c432 · 4a8c432
1 parent bba5911
commit 4a8c432
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 194 deletions.
diff --git a/sycl/include/CL/cl_usm_ext.h b/sycl/include/CL/cl_usm_ext.h
diff --git a/sycl/include/CL/sycl/detail/pi.h b/sycl/include/CL/sycl/detail/pi.h
@@ -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>
@@ -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 {

diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp
@@ -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;