Skip to content

Commit 74954b1

Browse files
sbalint98sbalint98
committed
[half]Add ifdefs around usages of half
1 parent e8e3dab commit 74954b1

22 files changed

+63
-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+
#ifdef NOT_HIPSYCL
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.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+
#ifdef NOT_HIPSYCL
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.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+
#ifdef NOT_HIPSYCL
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.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+
#ifdef NOT_HIPSYCL
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.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+
#ifdef NOT_HIPSYCL
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.hxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ void gemm(backend_selector<backend::mklcpu> 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+
#ifdef NOT_HIPSYCL
747747
void gemm(backend_selector<backend::mklcpu> 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::mklcpu> 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::mklcpu> 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/mklgpu/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::mklgpu> 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+
#ifdef NOT_HIPSYCL
747747
void gemm(backend_selector<backend::mklgpu> 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::mklgpu> 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::mklgpu> 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/netlib/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::netlib> 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+
#ifdef NOT_HIPSYCL
747747
void gemm(backend_selector<backend::netlib> 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::netlib> 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::netlib> 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/onemkl_blas_backends.hxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
4646
cl::sycl::buffer<std::complex<double>, 1> &b, std::int64_t ldb,
4747
std::complex<double> beta, cl::sycl::buffer<std::complex<double>, 1> &c,
4848
std::int64_t ldc);
49-
49+
#ifdef NOT_HIPSYCL
5050
ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
5151
oneapi::mkl::transpose transb, std::int64_t m, std::int64_t n,
5252
std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
@@ -58,7 +58,7 @@ ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
5858
std::int64_t k, float alpha, cl::sycl::buffer<half, 1> &a, std::int64_t lda,
5959
cl::sycl::buffer<half, 1> &b, std::int64_t ldb, float beta,
6060
cl::sycl::buffer<float, 1> &c, std::int64_t ldc);
61-
61+
#endif
6262
ONEMKL_EXPORT void symm(cl::sycl::queue &queue, oneapi::mkl::side left_right,
6363
oneapi::mkl::uplo upper_lower, std::int64_t m, std::int64_t n, float alpha,
6464
cl::sycl::buffer<float, 1> &a, std::int64_t lda,

‎include/oneapi/mkl/blas/predicates.hxx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,6 +1518,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
15181518
#endif
15191519
}
15201520

1521+
#ifdef NOT_HIPSYCL
15211522
inline void gemm_precondition(cl::sycl::queue &queue, transpose transa, transpose transb,
15221523
std::int64_t m, std::int64_t n, std::int64_t k, half alpha,
15231524
cl::sycl::buffer<half, 1> &a, std::int64_t lda,
@@ -1557,7 +1558,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
15571558
/* add postchecks to queue here for input args. */
15581559
#endif
15591560
}
1560-
1561+
#endif
15611562
inline void syr2_precondition(cl::sycl::queue &queue, uplo upper_lower, std::int64_t n, float alpha,
15621563
cl::sycl::buffer<float, 1> &x, std::int64_t incx,
15631564
cl::sycl::buffer<float, 1> &y, std::int64_t incy,
@@ -4749,7 +4750,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
47494750
/* add postchecks to queue here for input args. */
47504751
#endif
47514752
}
4752-
4753+
#ifdef NOT_HIPSYCL
47534754
inline void gemm_precondition(cl::sycl::queue &queue, transpose transa, transpose transb,
47544755
std::int64_t m, std::int64_t n, std::int64_t k, half alpha,
47554756
const half *a, std::int64_t lda, const half *b, std::int64_t ldb,
@@ -4769,7 +4770,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
47694770
/* add postchecks to queue here for input args. */
47704771
#endif
47714772
}
4772-
4773+
#endif
47734774
inline void syr2_precondition(cl::sycl::queue &queue, uplo upper_lower, std::int64_t n, float alpha,
47744775
const float *x, std::int64_t incx, const float *y, std::int64_t incy,
47754776
float *a, std::int64_t lda,

0 commit comments

Comments
 (0)