[BLAS][rocBLAS] Switch to using sycl:: insteald of cl::sycl:: (#192)

Author: sbalint98

include/oneapi/mkl/blas/detail/rocblas/blas_ct.hxx

@@ -45,13 +45,13 @@ rocblas_handle_container::~rocblas_handle_container() noexcept(false) {
 thread_local rocblas_handle_container RocblasScopedContextHandler::handle_helper =
     rocblas_handle_container{};
 
-RocblasScopedContextHandler::RocblasScopedContextHandler(cl::sycl::queue queue,
-                                                         cl::sycl::interop_handle &ih)
+RocblasScopedContextHandler::RocblasScopedContextHandler(sycl::queue queue,
+                                                         sycl::interop_handle &ih)
         : interop_h(ih) {}
 
-rocblas_handle RocblasScopedContextHandler::get_handle(const cl::sycl::queue &queue) {
-    cl::sycl::device device = queue.get_device();
-    int current_device = interop_h.get_native_device<cl::sycl::backend::hip>();
+rocblas_handle RocblasScopedContextHandler::get_handle(const sycl::queue &queue) {
+    sycl::device device = queue.get_device();
+    int current_device = interop_h.get_native_device<sycl::backend::hip>();
     hipStream_t streamId = get_stream(queue);
     rocblas_status err;
     auto it = handle_helper.rocblas_handle_mapper_.find(current_device);
@@ -84,8 +84,8 @@ rocblas_handle RocblasScopedContextHandler::get_handle(const cl::sycl::queue &qu
     return handle;
 }
 
-hipStream_t RocblasScopedContextHandler::get_stream(const cl::sycl::queue &queue) {
-    return interop_h.get_native_queue<cl::sycl::backend::hip>();
+hipStream_t RocblasScopedContextHandler::get_stream(const sycl::queue &queue) {
+    return interop_h.get_native_queue<sycl::backend::hip>();
 }
 
 } // namespace rocblas

include/oneapi/mkl/blas/detail/rocblas/onemkl_blas_rocblas.hxx

@@ -37,21 +37,21 @@ struct rocblas_handle_container {
 };
 
 class RocblasScopedContextHandler {
-    cl::sycl::interop_handle interop_h;
+    sycl::interop_handle interop_h;
     static thread_local rocblas_handle_container handle_helper;
-    cl::sycl::context get_context(const cl::sycl::queue &queue);
-    hipStream_t get_stream(const cl::sycl::queue &queue);
+    sycl::context get_context(const sycl::queue &queue);
+    hipStream_t get_stream(const sycl::queue &queue);
 
 public:
-    RocblasScopedContextHandler(cl::sycl::queue queue, cl::sycl::interop_handle &ih);
+    RocblasScopedContextHandler(sycl::queue queue, sycl::interop_handle &ih);
 
-    rocblas_handle get_handle(const cl::sycl::queue &queue);
+    rocblas_handle get_handle(const sycl::queue &queue);
 
     // This is a work-around function for reinterpret_casting the memory. This
     // will be fixed when SYCL-2020 has been implemented for Pi backend.
     template <typename T, typename U>
     inline T get_mem(U acc) {
-        return reinterpret_cast<T>(interop_h.get_native_mem<cl::sycl::backend::hip>(acc));
+        return reinterpret_cast<T>(interop_h.get_native_mem<sycl::backend::hip>(acc));
     }
 };
 

src/blas/backends/rocblas/rocblas_batch.cpp

@@ -29,9 +29,7 @@
 #include <CL/sycl/detail/pi.hpp>
 #else
 #include "rocblas_scope_handle_hipsycl.hpp"
-namespace cl::sycl {
-using interop_handler = cl::sycl::interop_handle;
-}
+
 #endif
 namespace oneapi {
 namespace mkl {
@@ -40,23 +38,23 @@ namespace rocblas {
 
 #ifdef __HIPSYCL__
 template <typename H, typename F>
-static inline void host_task_internal(H &cgh, cl::sycl::queue queue, F f) {
-    cgh.hipSYCL_enqueue_custom_operation([f, queue](cl::sycl::interop_handle ih) {
+static inline void host_task_internal(H &cgh, sycl::queue queue, F f) {
+    cgh.hipSYCL_enqueue_custom_operation([f, queue](sycl::interop_handle ih) {
         auto sc = RocblasScopedContextHandler(queue, ih);
         f(sc);
     });
 }
 #else
 template <typename H, typename F>
-static inline void host_task_internal(H &cgh, cl::sycl::queue queue, F f) {
-    cgh.interop_task([f, queue](cl::sycl::interop_handler ih) {
+static inline void host_task_internal(H &cgh, sycl::queue queue, F f) {
+    cgh.interop_task([f, queue](sycl::interop_handler ih) {
         auto sc = RocblasScopedContextHandler(queue, ih);
         f(sc);
     });
 }
 #endif
 template <typename H, typename F>
-static inline void onemkl_rocblas_host_task(H &cgh, cl::sycl::queue queue, F f) {
+static inline void onemkl_rocblas_host_task(H &cgh, sycl::queue queue, F f) {
     (void)host_task_internal(cgh, queue, f);
 }