Skip to content

Commit f9a3289

Browse files
committed
[half]Add ifdefs around usages of half
Use DISABLE_HALF_RUTINES, use cmake config to set
1 parent e8e3dab commit f9a3289

29 files changed

+71
-38
lines changed

include/oneapi/mkl/blas.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose tran
261261
c, ldc);
262262
gemm_postcondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
263263
}
264-
264+
#ifndef DISABLE_HALF_RUTINES
265265
static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
266266
std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
267267
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
@@ -281,7 +281,7 @@ static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose tran
281281
c, ldc);
282282
gemm_postcondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);
283283
}
284-
284+
#endif
285285
static inline void gemm_batch(cl::sycl::queue &queue, transpose transa, transpose transb,
286286
std::int64_t m, std::int64_t n, std::int64_t k, float alpha,
287287
cl::sycl::buffer<float, 1> &a, std::int64_t lda,

include/oneapi/mkl/blas/detail/blas_ct_backends.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <cstdint>
2626

2727
#include "oneapi/mkl/types.hpp"
28+
#include "oneapi/mkl/detail/config.hpp"
2829
#include "oneapi/mkl/detail/backend_selector.hpp"
2930

3031
namespace oneapi {

include/oneapi/mkl/blas/detail/blas_ct_backends.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ static inline void gemm(backend_selector<backend::BACKEND> selector, transpose t
413413
std::int64_t lda, cl::sycl::buffer<std::complex<double>, 1> &b,
414414
std::int64_t ldb, std::complex<double> beta,
415415
cl::sycl::buffer<std::complex<double>, 1> &c, std::int64_t ldc);
416-
416+
#ifndef DISABLE_HALF_RUTINES
417417
static inline void gemm(backend_selector<backend::BACKEND> selector, transpose transa,
418418
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
419419
half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
@@ -425,7 +425,7 @@ static inline void gemm(backend_selector<backend::BACKEND> selector, transpose t
425425
float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
426426
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
427427
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);
428-
428+
#endif
429429
static inline void herk(backend_selector<backend::BACKEND> selector, uplo upper_lower,
430430
transpose trans, std::int64_t n, std::int64_t k, float alpha,
431431
cl::sycl::buffer<std::complex<float>, 1> &a, std::int64_t lda, float beta,

include/oneapi/mkl/blas/detail/blas_loader.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <cstdint>
2525
#include <CL/sycl.hpp>
2626

27+
#include "oneapi/mkl/detail/config.hpp"
2728
#include "oneapi/mkl/types.hpp"
2829

2930
#include "oneapi/mkl/detail/export.hpp"

include/oneapi/mkl/blas/detail/blas_loader.hxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, tran
396396
std::int64_t lda, cl::sycl::buffer<std::complex<double>, 1> &b,
397397
std::int64_t ldb, std::complex<double> beta,
398398
cl::sycl::buffer<std::complex<double>, 1> &c, std::int64_t ldc);
399+
#ifndef DISABLE_HALF_RUTINES
399400
ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, transpose transa,
400401
transpose transb, std::int64_t m, std::int64_t n, std::int64_t k,
401402
half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
@@ -406,6 +407,7 @@ ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, tran
406407
float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
407408
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
408409
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);
410+
#endif
409411

410412
ONEMKL_EXPORT void syr2(oneapi::mkl::device libkey, cl::sycl::queue &queue, uplo upper_lower,
411413
std::int64_t n, float alpha, cl::sycl::buffer<float, 1> &x,

include/oneapi/mkl/blas/detail/cublas/blas_ct.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "oneapi/mkl/types.hpp"
2828
#include "oneapi/mkl/detail/backend_selector.hpp"
29+
#include "oneapi/mkl/detail/config.hpp"
2930
#include "oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hpp"
3031
#include "oneapi/mkl/blas/detail/blas_ct_backends.hpp"
3132

include/oneapi/mkl/blas/detail/cublas/blas_ct.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos
743743
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
744744
c, ldc);
745745
}
746-
746+
#ifndef DISABLE_HALF_RUTINES
747747
void gemm(backend_selector<backend::cublas> selector, transpose transa, transpose transb,
748748
std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
749749
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
@@ -767,7 +767,7 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos
767767
gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,
768768
c, ldc);
769769
}
770-
770+
#endif
771771
void syr2(backend_selector<backend::cublas> selector, uplo upper_lower, std::int64_t n, float alpha,
772772
cl::sycl::buffer<float, 1> &x, std::int64_t incx, cl::sycl::buffer<float, 1> &y,
773773
std::int64_t incy, cl::sycl::buffer<float, 1> &a, std::int64_t lda) {

include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <cstdint>
2424
#include <string>
2525
#include "oneapi/mkl/types.hpp"
26+
#include "oneapi/mkl/detail/config.hpp"
2627

2728
namespace oneapi {
2829
namespace mkl {

include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64
496496
cl::sycl::buffer<std::complex<double>, 1> &a, std::int64_t lda,
497497
cl::sycl::buffer<std::complex<double>, 1> &b, std::int64_t ldb, std::complex<double> beta,
498498
cl::sycl::buffer<std::complex<double>, 1> &c, std::int64_t ldc);
499-
499+
#ifndef DISABLE_HALF_RUTINES
500500
void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
501501
std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,
502502
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,
@@ -506,7 +506,7 @@ void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64
506506
std::int64_t n, std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a,
507507
std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
508508
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);
509-
509+
#endif
510510
void hemm(cl::sycl::queue &queue, side left_right, uplo upper_lower, std::int64_t m, std::int64_t n,
511511
std::complex<float> alpha, cl::sycl::buffer<std::complex<float>, 1> &a, std::int64_t lda,
512512
cl::sycl::buffer<std::complex<float>, 1> &b, std::int64_t ldb, std::complex<float> beta,

include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <cstdint>
2626

2727
#include "oneapi/mkl/types.hpp"
28+
#include "oneapi/mkl/detail/config.hpp"
2829
#include "oneapi/mkl/detail/backend_selector.hpp"
2930

3031
#include "oneapi/mkl/blas/detail/blas_ct_backends.hpp"

0 commit comments

Comments
 (0)