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.

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

[half]Add ifdefs around usages of half #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
.git/

# Build
build/
build*/
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -261,27 +261,25 @@ static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose tran
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, 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) {
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,
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);
gemm_postcondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
}

static inline void gemm_batch(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<float, 1> &a, std::int64_t lda,
Expand Down
1 change: 1 addition & 0 deletions include/oneapi/mkl/blas/detail/blas_ct_backends.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <cstdint>

#include "oneapi/mkl/types.hpp"
#include "oneapi/mkl/detail/config.hpp"
#include "oneapi/mkl/detail/backend_selector.hpp"

namespace oneapi {
Expand Down
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/blas_ct_backends.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -413,19 +413,17 @@ static inline void gemm(backend_selector<backend::BACKEND> selector, transpose t
std::int64_t lda, cl::sycl::buffer<std::complex<double>, 1> &b,
std::int64_t ldb, std::complex<double> beta,
cl::sycl::buffer<std::complex<double>, 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,
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,
transpose trans, std::int64_t n, std::int64_t k, float alpha,
cl::sycl::buffer<std::complex<float>, 1> &a, std::int64_t lda, float beta,
Expand Down
1 change: 1 addition & 0 deletions include/oneapi/mkl/blas/detail/blas_loader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <cstdint>
#include <CL/sycl.hpp>

#include "oneapi/mkl/detail/config.hpp"
#include "oneapi/mkl/types.hpp"

#include "oneapi/mkl/detail/export.hpp"
Expand Down
10 changes: 5 additions & 5 deletions include/oneapi/mkl/blas/detail/blas_loader.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,13 @@ 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
1 change: 1 addition & 0 deletions include/oneapi/mkl/blas/detail/cublas/blas_ct.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "oneapi/mkl/types.hpp"
#include "oneapi/mkl/detail/backend_selector.hpp"
#include "oneapi/mkl/detail/config.hpp"
#include "oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hpp"
#include "oneapi/mkl/blas/detail/blas_ct_backends.hpp"

Expand Down
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/cublas/blas_ct.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,10 @@ 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);
}

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 +756,8 @@ 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 +766,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);
}

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
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <cstdint>
#include <string>
#include "oneapi/mkl/types.hpp"
#include "oneapi/mkl/detail/config.hpp"

namespace oneapi {
namespace mkl {
Expand Down
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -496,17 +496,15 @@ void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64
cl::sycl::buffer<std::complex<double>, 1> &a, std::int64_t lda,
cl::sycl::buffer<std::complex<double>, 1> &b, std::int64_t ldb, std::complex<double> beta,
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,
std::complex<float> alpha, cl::sycl::buffer<std::complex<float>, 1> &a, std::int64_t lda,
cl::sycl::buffer<std::complex<float>, 1> &b, std::int64_t ldb, std::complex<float> beta,
Expand Down
1 change: 1 addition & 0 deletions include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <cstdint>

#include "oneapi/mkl/types.hpp"
#include "oneapi/mkl/detail/config.hpp"
#include "oneapi/mkl/detail/backend_selector.hpp"

#include "oneapi/mkl/blas/detail/blas_ct_backends.hpp"
Expand Down
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,10 @@ void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

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 +756,8 @@ 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 All @@ -767,7 +766,6 @@ void gemm(backend_selector<backend::mklcpu> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

void syr2(backend_selector<backend::mklcpu> 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
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/mklgpu/blas_ct.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,10 @@ void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

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 +756,8 @@ 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 All @@ -767,7 +766,6 @@ void gemm(backend_selector<backend::mklgpu> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

void syr2(backend_selector<backend::mklgpu> 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
12 changes: 5 additions & 7 deletions include/oneapi/mkl/blas/detail/netlib/blas_ct.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,10 @@ void gemm(backend_selector<backend::netlib> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

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 +756,8 @@ 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 All @@ -767,7 +766,6 @@ void gemm(backend_selector<backend::netlib> selector, transpose transa, transpos
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
c, ldc);
}

void syr2(backend_selector<backend::netlib> 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
Loading