Skip to content
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

Jump to bottom

[Sparse BLAS] remove deprecation warning when using oneMKL 2024.1 with sparse::trsv() on x86 CPU and Intel GPU backends #468

Closed
wants to merge 4 commits into from
Closed

[Sparse BLAS] remove deprecation warning when using oneMKL 2024.1 with sparse::trsv() on x86 CPU and Intel GPU backends #468

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b1c1db
[Sparse BLAS]remove deprecation warning note in 2024.1 by switching t…
spencerpatty Apr 4, 2024
c4d7095
run clang formatter
spencerpatty Apr 4, 2024
14478c4
remove 2024.0 compliant call and add static_cast to void implicit casts
spencerpatty Apr 5, 2024
37c6398
Update src/sparse_blas/backends/mkl_common/mkl_helper.hpp
spencerpatty Apr 5, 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
1 change: 1 addition & 0 deletions src/sparse_blas/backends/mkl_common/mkl_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
// MKLCPU and MKLGPU backends include
// This include defines its own oneapi::mkl::sparse namespace with some of the types that are used here: matrix_handle_t, index_base, transpose, uolo, diag.
#include <oneapi/mkl/spblas.hpp>
#include "mkl_version.h"
spencerpatty marked this conversation as resolved.
Show resolved Hide resolved

// Includes are set up so that oneapi::mkl::sparse namespace refers to the MKLCPU and MKLGPU backends namespace (oneMKL product)
// in this file.
Expand Down
21 changes: 18 additions & 3 deletions src/sparse_blas/backends/mkl_common/mkl_operations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,17 @@ std::enable_if_t<detail::is_fp_supported_v<fpType>> gemv(
sycl::queue& queue, transpose transpose_val, const fpType alpha,
detail::matrix_handle* A_handle, sycl::buffer<fpType, 1>& x, const fpType beta,
sycl::buffer<fpType, 1>& y) {
oneapi::mkl::sparse::gemv(queue, transpose_val, alpha, detail::get_handle(A_handle), x, beta, y);
oneapi::mkl::sparse::gemv(queue, transpose_val, alpha, detail::get_handle(A_handle), x, beta,
y);
}

template <typename fpType>
std::enable_if_t<detail::is_fp_supported_v<fpType>, sycl::event> gemv(
sycl::queue& queue, transpose transpose_val, const fpType alpha,
detail::matrix_handle* A_handle, const fpType* x, const fpType beta, fpType* y,
const std::vector<sycl::event>& dependencies) {
return oneapi::mkl::sparse::gemv(queue, transpose_val, alpha, detail::get_handle(A_handle), x, beta, y,
dependencies);
return oneapi::mkl::sparse::gemv(queue, transpose_val, alpha, detail::get_handle(A_handle), x,
beta, y, dependencies);
}

template <typename fpType>
Expand All @@ -87,8 +88,15 @@ std::enable_if_t<detail::is_fp_supported_v<fpType>> trsv(sycl::queue& queue, upl
throw mkl::unimplemented("sparse_blas/backends/mkl", __FUNCTION__,
"Transposed or conjugate trsv is not supported");
}

#if defined(__INTEL_MKL__) && (__INTEL_MKL__ >= 2024) && (__INTEL_MKL_UPDATE__ >= 1)
const fpType alpha = fpType(1.0);
oneapi::mkl::sparse::trsv(queue, uplo_val, transpose_val, diag_val, alpha,
detail::get_handle(A_handle), x, y);
#else
oneapi::mkl::sparse::trsv(queue, uplo_val, transpose_val, diag_val,
detail::get_handle(A_handle), x, y);
#endif
}

template <typename fpType>
Expand All @@ -102,9 +110,16 @@ std::enable_if_t<detail::is_fp_supported_v<fpType>, sycl::event> trsv(
"Transposed or conjugate trsv is not supported");
}
// TODO: Remove const_cast in future oneMKL release
#if defined(__INTEL_MKL__) && (__INTEL_MKL__ >= 2024) && (__INTEL_MKL_UPDATE__ >= 1)
const fpType alpha = fpType(1.0);
return oneapi::mkl::sparse::trsv(queue, uplo_val, transpose_val, diag_val, alpha,
detail::get_handle(A_handle), const_cast<fpType*>(x), y,
dependencies);
#else
return oneapi::mkl::sparse::trsv(queue, uplo_val, transpose_val, diag_val,
detail::get_handle(A_handle), const_cast<fpType*>(x), y,
dependencies);
#endif
}

template <typename fpType>
Expand Down