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

Use appropiately qualified names in blas and rng #105

Merged
merged 5 commits into from
Aug 19, 2021
Merged

Use appropiately qualified names in blas and rng #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04e0b3d
Use appropiately qualified names in blas and rng
sbalint98 Jun 9, 2021
d5b5249
Revert changing to cl::sycl::half from half
sbalint98 Jul 15, 2021
8e57b1a
Apply clang-format
sbalint98 Jul 15, 2021
67916e0
Use original half qualification in test_common abs function
sbalint98 Jul 20, 2021
b0c8511
remove unecessary changes
sbalint98 Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions include/oneapi/mkl/blas.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,19 +263,22 @@ static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose tran
}

static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc) {
std::int64_t n, std::int64_t k, cl::sycl::half alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
mmeterel marked this conversation as resolved.
Show resolved Hide resolved
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb,
cl::sycl::half beta, cl::sycl::buffer<cl::sycl::half, 1> &c,
std::int64_t ldc) {
gemm_precondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
detail::gemm(get_device_id(queue), queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
gemm_postcondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
}

static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb,
float beta, cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
gemm_precondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
detail::gemm(get_device_id(queue), queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
Expand Down
10 changes: 5 additions & 5 deletions include/oneapi/mkl/blas/detail/blas_ct_backends.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,14 +416,14 @@ static inline void gemm(backend_selector<backend::BACKEND> selector, transpose t

static inline void gemm(backend_selector<backend::BACKEND> selector, transpose transa,
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc);
cl::sycl::half alpha, cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc);

static inline void gemm(backend_selector<backend::BACKEND> selector, transpose transa,
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
float alpha, cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);

static inline void herk(backend_selector<backend::BACKEND> selector, uplo upper_lower,
Expand Down
11 changes: 6 additions & 5 deletions include/oneapi/mkl/blas/detail/blas_loader.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,14 @@ ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, tran
cl::sycl::buffer<std::complex<double>, 1> &c, std::int64_t ldc);
ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, transpose transa,
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc);
cl::sycl::half alpha, cl::sycl::buffer<cl::sycl::half, 1> &a,
std::int64_t lda, cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb,
cl::sycl::half beta, cl::sycl::buffer<cl::sycl::half, 1> &c,
std::int64_t ldc);
ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, transpose transa,
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
float alpha, cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);

ONEMKL_EXPORT void syr2(oneapi::mkl::device libkey, cl::sycl::queue &queue, uplo upper_lower,
Expand Down
13 changes: 7 additions & 6 deletions include/oneapi/mkl/blas/detail/cublas/blas_ct.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,10 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::cublas> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc) {
std::int64_t m, std::int64_t n, std::int64_t k, cl::sycl::half alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
oneapi::mkl::blas::cublas::MAJOR::gemm(selector.get_queue(), transa, transb, m, n, k, alpha, a,
Expand All @@ -757,8 +758,9 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::cublas> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
Expand All @@ -767,7 +769,6 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

mmeterel marked this conversation as resolved.
Show resolved Hide resolved
void syr2(backend_selector<backend::cublas> selector, uplo upper_lower, std::int64_t n, float alpha,
cl::sycl::buffer<float, 1> &x, std::int64_t incx, cl::sycl::buffer<float, 1> &y,
std::int64_t incy, cl::sycl::buffer<float, 1> &a, std::int64_t lda) {
Expand Down
10 changes: 5 additions & 5 deletions include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,13 +498,13 @@ void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64
cl::sycl::buffer<std::complex<double>, 1> &c, std::int64_t ldc);

void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc);
std::int64_t n, std::int64_t k, cl::sycl::half alpha, cl::sycl::buffer<cl::sycl::half, 1> &a,
std::int64_t lda, cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc);

void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<cl::sycl::half, 1> &a,
std::int64_t lda, cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);

void hemm(cl::sycl::queue &queue, side left_right, uplo upper_lower, std::int64_t m, std::int64_t n,
Expand Down
12 changes: 7 additions & 5 deletions include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,10 @@ void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc) {
std::int64_t m, std::int64_t n, std::int64_t k, cl::sycl::half alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
oneapi::mkl::blas::mklcpu::MAJOR::gemm(selector.get_queue(), transa, transb, m, n, k, alpha, a,
Expand All @@ -757,8 +758,9 @@ void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
Expand Down
12 changes: 7 additions & 5 deletions include/oneapi/mkl/blas/detail/mklgpu/blas_ct.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,10 @@ void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc) {
std::int64_t m, std::int64_t n, std::int64_t k, cl::sycl::half alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
oneapi::mkl::blas::mklgpu::MAJOR::gemm(selector.get_queue(), transa, transb, m, n, k, alpha, a,
Expand All @@ -757,8 +758,9 @@ void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
Expand Down
12 changes: 7 additions & 5 deletions include/oneapi/mkl/blas/detail/netlib/blas_ct.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,10 @@ void gemm(backend_selector<backend::netlib> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::netlib> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc) {
std::int64_t m, std::int64_t n, std::int64_t k, cl::sycl::half alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
oneapi::mkl::blas::netlib::MAJOR::gemm(selector.get_queue(), transa, transb, m, n, k, alpha, a,
Expand All @@ -757,8 +758,9 @@ void gemm(backend_selector<backend::netlib> selector, transpose transa, transpos
}

void gemm(backend_selector<backend::netlib> selector, transpose transa, transpose transb,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t m, std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc) {
gemm_precondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c,
ldc);
Expand Down
10 changes: 5 additions & 5 deletions include/oneapi/mkl/blas/detail/onemkl_blas_backends.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,

ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
oneapi::mkl::transpose transb, std::int64_t m, std::int64_t n,
std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
cl::sycl::buffer<half, 1> &c, std::int64_t ldc);
std::int64_t k, cl::sycl::half alpha, cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, cl::sycl::half beta,
cl::sycl::buffer<cl::sycl::half, 1> &c, std::int64_t ldc);

ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
oneapi::mkl::transpose transb, std::int64_t m, std::int64_t n,
std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
std::int64_t k, float alpha, cl::sycl::buffer<cl::sycl::half, 1> &a, std::int64_t lda,
cl::sycl::buffer<cl::sycl::half, 1> &b, std::int64_t ldb, float beta,
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);

ONEMKL_EXPORT void symm(cl::sycl::queue &queue, oneapi::mkl::side left_right,
Expand Down