Skip to content

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

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

Merged
antonwolfy merged 8 commits into from
Jul 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2999b1
CL/sycl.hpp is deprecated, use sycl/sycl.hpp
antonwolfy Jul 3, 2024
adaa38a
Explicitly include complex header
antonwolfy Jul 3, 2024
d733669
Use explicit type casting in a function from sycl namespace
antonwolfy Jul 3, 2024
6cbacd4
Use proper sycl namespace
antonwolfy Jul 3, 2024
423aaf4
Use multi_ptr instead of raw pointer in sycl::modf
antonwolfy Jul 4, 2024
40c413c
Merge branch 'master' into resolve-build-errors
antonwolfy Jul 4, 2024
2b8df19
Applied pre-commit hook for clang-format
antonwolfy Jul 4, 2024
38aa0fb
Merge branch 'master' into resolve-build-errors
antonwolfy Jul 4, 2024
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
2 changes: 1 addition & 1 deletion dpnp/backend/examples/example10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/geqrf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/gesv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/gesvd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/getrf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/getri.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/getrs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/heevd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/orgqr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/potrf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/syevd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/ungqr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#pragma once

#include <CL/sycl.hpp>
#include <oneapi/mkl.hpp>
#include <sycl/sycl.hpp>

#include <dpctl4pybind11.hpp>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/sycl_ext/sum_mean.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 10 additions & 6 deletions dpnp/backend/kernels/dpnp_krnl_mathematical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)*/
{
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
};

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/src/dpnp_fptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <complex>
#include <map>

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

#include <dpnp_iface_fptr.hpp>

Expand Down
3 changes: 2 additions & 1 deletion dpnp/backend/src/dpnp_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/src/verbose.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down