Adapt to UR changes; use SYCL spec APIs.

Author: maleadt

deps/CMakeLists.txt

@@ -19,7 +19,7 @@ target_link_libraries(oneapi_support
   # XXX: we don't want to link against this plugin, but otherwise the run-time
   #      loader doesn't find it (since it's located in the non-global Conda
   #      library directory, and we can't set LD_LIBRARY_PATH from within Julia).
-  pi_level_zero
+  ur_adapter_level_zero
 )
 
 install(TARGETS oneapi_support

deps/src/sycl.cpp

@@ -6,7 +6,8 @@
 
 extern "C" int syclPlatformCreate(syclPlatform_t *obj,
                                   ze_driver_handle_t driver) {
-    auto sycl_platform = sycl::ext::oneapi::level_zero::make_platform((pi_native_handle) driver);
+    auto sycl_platform =
+        sycl::make_platform<sycl::backend::ext_oneapi_level_zero>(driver);
     *obj = new syclPlatform_st({sycl_platform});
     return 0;
 }
@@ -19,7 +20,7 @@ extern "C" int syclPlatformDestroy(syclPlatform_t obj) {
 extern "C" int syclDeviceCreate(syclDevice_t *obj, syclPlatform_t platform,
                                 ze_device_handle_t device) {
     auto sycl_device =
-        sycl::ext::oneapi::level_zero::make_device(platform->val, (pi_native_handle) device);
+        sycl::make_device<sycl::backend::ext_oneapi_level_zero>(device);
     *obj = new syclDevice_st({sycl_device});
     return 0;
 }
@@ -35,9 +36,15 @@ extern "C" int syclContextCreate(syclContext_t *obj, syclDevice_t *devices,
     std::vector<sycl::device> sycl_devices(ndevices);
     for (size_t i = 0; i < ndevices; i++)
         sycl_devices[i] = devices[i]->val;
+    auto sycl_ownership =
+        keep_ownership ? sycl::ext::oneapi::level_zero::ownership::keep
+                       : sycl::ext::oneapi::level_zero::ownership::transfer;
+    sycl::backend_input_t<sycl::backend::ext_oneapi_level_zero, sycl::context>
+        sycl_context_input = {context, sycl_devices, sycl_ownership};
 
     auto sycl_context =
-        sycl::ext::oneapi::level_zero::make_context(sycl_devices, (pi_native_handle) context, keep_ownership);
+        sycl::make_context<sycl::backend::ext_oneapi_level_zero>(
+            sycl_context_input);
     *obj = new syclContext_st({sycl_context});
     return 0;
 }
@@ -51,7 +58,15 @@ extern "C" int syclQueueCreate(syclQueue_t *obj, syclContext_t context,
                                syclDevice_t device,
                                ze_command_queue_handle_t queue,
                                int keep_ownership) {
-    auto sycl_queue = sycl::ext::oneapi::level_zero::make_queue(context->val, device->val, (pi_native_handle) queue, false, keep_ownership, {});
+    auto sycl_ownership =
+        keep_ownership ? sycl::ext::oneapi::level_zero::ownership::keep
+                       : sycl::ext::oneapi::level_zero::ownership::transfer;
+    auto sycl_queue_input =
+        sycl::backend_input_t<sycl::backend::ext_oneapi_level_zero,
+                              sycl::queue>{queue, device->val, sycl_ownership};
+
+    auto sycl_queue = sycl::make_queue<sycl::backend::ext_oneapi_level_zero>(
+        sycl_queue_input, context->val);
     *obj = new syclQueue_st({sycl_queue});
     return 0;
 }
@@ -63,9 +78,17 @@ extern "C" int syclQueueDestroy(syclQueue_t obj) {
 
 extern "C" int syclEventCreate(syclEvent_t *obj, syclContext_t context,
                                ze_event_handle_t event, int keep_ownership) {
-   auto sycl_event = sycl::ext::oneapi::level_zero::make_event(context->val, (pi_native_handle) event, keep_ownership);
-   *obj = new syclEvent_st({sycl_event});
-   return 0;
+    auto sycl_ownership =
+        keep_ownership ? sycl::ext::oneapi::level_zero::ownership::keep
+                       : sycl::ext::oneapi::level_zero::ownership::transfer;
+    auto sycl_event_input =
+        sycl::backend_input_t<sycl::backend::ext_oneapi_level_zero,
+                              sycl::event>{event, sycl_ownership};
+
+    auto sycl_event = sycl::make_event<sycl::backend::ext_oneapi_level_zero>(
+        sycl_event_input, context->val);
+    *obj = new syclEvent_st({sycl_event});
+    return 0;
 }
 
 extern "C" int syclEventDestroy(syclEvent_t obj) {