Skip to content

Fixes for compiling with oneAPI 2025 on Linux #3643

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
christophe-murphy merged 1 commit into from
Mar 14, 2025
+17 −21
Merged

Fixes for compiling with oneAPI 2025 on Linux #3643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
set(SYCL_COMPILER ON)
set(MKL_THREADING "tbb_thread")
set(MKL_INTERFACE "ilp64")
find_package(MKL 2024.1)
find_package(MKL)
endif()

af_multiple_option(NAME AF_COMPUTE_LIBRARY
Expand Down
2 changes: 1 addition & 1 deletion src/backend/oneapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ target_link_libraries(afoneapi
OpenCL::OpenCL
OpenCL::cl2hpp
-fno-sycl-id-queries-fit-in-int
$<$<PLATFORM_ID:Linux>:-fsycl-link-huge-device-code>
$<$<PLATFORM_ID:Linux>:-flink-huge-device-code>
$<$<PLATFORM_ID:Linux>:-fvisibility-inlines-hidden>
$<$<PLATFORM_ID:Linux>:-fno-sycl-rdc>
-fsycl-max-parallel-link-jobs=${NumberOfThreads}
Expand Down
14 changes: 7 additions & 7 deletions src/backend/oneapi/kernel/mean.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,9 @@ T mean_all_weighted(Param<T> in, Param<Tw> iwt) {
getQueue()
.submit([&](sycl::handler &h) {
auto acc_in =
tmpOut_get->template get_host_access(h, sycl::read_only);
tmpOut_get->get_host_access(h, sycl::read_only);
auto acc_wt =
tmpWt_get->template get_host_access(h, sycl::read_only);
tmpWt_get->get_host_access(h, sycl::read_only);

h.host_task([acc_in, acc_wt, tmp_elements, &val] {
val = static_cast<compute_t<T>>(acc_in[0]);
Expand All @@ -635,9 +635,9 @@ T mean_all_weighted(Param<T> in, Param<Tw> iwt) {
compute_t<T> val;
getQueue()
.submit([&](sycl::handler &h) {
auto acc_in = in.data->template get_host_access(
auto acc_in = in.data->get_host_access(
h, sycl::range{in_elements}, sycl::read_only);
auto acc_wt = iwt.data->template get_host_access(
auto acc_wt = iwt.data->get_host_access(
h, sycl::range{in_elements}, sycl::read_only);

h.host_task([acc_in, acc_wt, in_elements, &val]() {
Expand Down Expand Up @@ -700,9 +700,9 @@ To mean_all(Param<Ti> in) {
getQueue()
.submit([&](sycl::handler &h) {
auto out =
tmpOut_get->template get_host_access(h, sycl::read_only);
tmpOut_get->get_host_access(h, sycl::read_only);
auto ct =
tmpCt_get->template get_host_access(h, sycl::read_only);
tmpCt_get->get_host_access(h, sycl::read_only);

h.host_task([out, ct, tmp_elements, &val] {
val = static_cast<compute_t<To>>(out[0]);
Expand All @@ -721,7 +721,7 @@ To mean_all(Param<Ti> in) {
getQueue()
.submit([&](sycl::handler &h) {
auto acc_in =
in.data->template get_host_access(h, sycl::read_only);
in.data->get_host_access(h, sycl::read_only);
h.host_task([acc_in, in_elements, &val]() {
common::Transform<Ti, compute_t<To>, af_add_t> transform;
compute_t<Tw> count = static_cast<compute_t<Tw>>(1);
Expand Down
20 changes: 8 additions & 12 deletions src/backend/oneapi/kernel/sparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,13 @@ class dense2csrCreateKernel {
if (gidy >= (unsigned)valinfo_.dims[1]) return;

int rowoff = rowptr_[gidx];
T *svalptr_ptr = svalptr_.get_pointer();
int *scolptr_ptr = scolptr_.get_pointer();
svalptr_ptr += rowoff;
scolptr_ptr += rowoff;
auto svalptr_ptr = svalptr_.get_pointer();
auto scolptr_ptr = scolptr_.get_pointer();

T *dvalptr_ptr = dvalptr_.get_pointer();
int *dcolptr_ptr = dcolptr_.get_pointer();
dvalptr_ptr += valinfo_.offset;
dcolptr_ptr += colinfo_.offset;
auto dvalptr_ptr = dvalptr_.get_pointer();
auto dcolptr_ptr = dcolptr_.get_pointer();

T val = dvalptr_ptr[gidx + gidy * (unsigned)valinfo_.strides[1]];
T val = dvalptr_ptr[gidx + gidy * (unsigned)valinfo_.strides[1] + valinfo_.offset];

if constexpr (std::is_same_v<decltype(val), std::complex<float>> ||
std::is_same_v<decltype(val), std::complex<double>>) {
Expand All @@ -210,9 +206,9 @@ class dense2csrCreateKernel {
if (val == 0) return;
}

int oloc = dcolptr_ptr[gidx + gidy * colinfo_.strides[1]];
svalptr_ptr[oloc - 1] = val;
scolptr_ptr[oloc - 1] = gidy;
int oloc = dcolptr_ptr[gidx + gidy * colinfo_.strides[1] + colinfo_.offset];
svalptr_ptr[oloc + rowoff - 1] = val;
scolptr_ptr[oloc + rowoff - 1] = gidy;
}

private:
Expand Down