Resolve compilation issues with new DPC++ 2025.0 compiler (#1907)

antonwolfy · web-flow · commit e6cf9d7192cf · 2024-07-06T21:46:15.000+02:00
* CL/sycl.hpp is deprecated, use sycl/sycl.hpp

* Explicitly include complex header

* Use explicit type casting in a function from sycl namespace

* Use proper sycl namespace

* Use multi_ptr instead of raw pointer in sycl::modf

* Applied pre-commit hook for clang-format
diff --git a/dpnp/backend/examples/example10.cpp b/dpnp/backend/examples/example10.cpp
@@ -35,8 +35,8 @@
 #include <iostream>
 #include <time.h>
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpnp_iface.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/geqrf.hpp b/dpnp/backend/extensions/lapack/geqrf.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/gesv.hpp b/dpnp/backend/extensions/lapack/gesv.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/gesvd.hpp b/dpnp/backend/extensions/lapack/gesvd.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/getrf.hpp b/dpnp/backend/extensions/lapack/getrf.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/getri.hpp b/dpnp/backend/extensions/lapack/getri.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/getrs.hpp b/dpnp/backend/extensions/lapack/getrs.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/heevd.hpp b/dpnp/backend/extensions/lapack/heevd.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/orgqr.hpp b/dpnp/backend/extensions/lapack/orgqr.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/potrf.hpp b/dpnp/backend/extensions/lapack/potrf.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/syevd.hpp b/dpnp/backend/extensions/lapack/syevd.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/lapack/ungqr.hpp b/dpnp/backend/extensions/lapack/ungqr.hpp
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpctl4pybind11.hpp>
 
diff --git a/dpnp/backend/extensions/sycl_ext/sum_mean.hpp b/dpnp/backend/extensions/sycl_ext/sum_mean.hpp
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "dispatcher_utils.hpp"
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <tuple>
 
 #include "utils/memory_overlap.hpp"
diff --git a/dpnp/backend/kernels/dpnp_krnl_mathematical.cpp b/dpnp/backend/kernels/dpnp_krnl_mathematical.cpp
@@ -89,10 +89,10 @@ DPCTLSyclEventRef dpnp_ediff1d_c(DPCTLSyclQueueRef q_ref,
     _DataType_input *input1_data = input1_ptr.get_ptr();
     _DataType_output *result = result_ptr.get_ptr();
 
-    cl::sycl::event event;
-    cl::sycl::range<1> gws(result_size);
+    sycl::event event;
+    sycl::range<1> gws(result_size);
 
-    auto kernel_parallel_for_func = [=](cl::sycl::id<1> global_id) {
+    auto kernel_parallel_for_func = [=](sycl::id<1> global_id) {
         size_t output_id =
             global_id[0]; /*for (size_t i = 0; i < result_size; ++i)*/
         {
@@ -101,7 +101,7 @@ DPCTLSyclEventRef dpnp_ediff1d_c(DPCTLSyclQueueRef q_ref,
             result[output_id] = next_elem - curr_elem;
         }
     };
-    auto kernel_func = [&](cl::sycl::handler &cgh) {
+    auto kernel_func = [&](sycl::handler &cgh) {
         cgh.parallel_for<
             class dpnp_ediff1d_c_kernel<_DataType_input, _DataType_output>>(
             gws, kernel_parallel_for_func);
@@ -205,8 +205,12 @@ DPCTLSyclEventRef dpnp_modf_c(DPCTLSyclQueueRef q_ref,
         auto kernel_parallel_for_func = [=](sycl::id<1> global_id) {
             size_t i = global_id[0]; /*for (size_t i = 0; i < size; ++i)*/
             {
-                _DataType_input input_elem1 = array1[i];
-                result2[i] = sycl::modf(double(input_elem1), &result1[i]);
+                double input_elem1 = static_cast<double>(array1[i]);
+                auto res_multi_ptr = sycl::address_space_cast<
+                    sycl::access::address_space::global_space,
+                    sycl::access::decorated::yes>(&result1[i]);
+
+                result2[i] = sycl::modf(input_elem1, res_multi_ptr);
             }
         };
 
diff --git a/dpnp/backend/src/dpnp_fptr.hpp b/dpnp/backend/src/dpnp_fptr.hpp
@@ -35,7 +35,7 @@
 #include <complex>
 #include <map>
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpnp_iface_fptr.hpp>
 
diff --git a/dpnp/backend/src/dpnp_utils.hpp b/dpnp/backend/src/dpnp_utils.hpp
@@ -29,10 +29,11 @@
 
 #include <algorithm>
 #include <cassert>
+#include <complex>
 #include <iostream>
 #include <iterator>
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #include <dpnp_iface_fptr.hpp>
 
diff --git a/dpnp/backend/src/verbose.hpp b/dpnp/backend/src/verbose.hpp
@@ -27,7 +27,7 @@
 #ifndef VERBOSE_H // Cython compatibility
 #define VERBOSE_H
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 bool is_verbose_mode();
 void set_barrier_event(sycl::queue queue, std::vector<sycl::event> &depends);
