:[cublas] correct typo, use ENABLE_HALF_ROUTINES instead of DISABLE

sbalint98 · sbalint98 · commit 2ff8f9f73c85 · 2021-05-21T21:56:26.000+02:00
diff --git a/include/oneapi/mkl/blas.hxx b/include/oneapi/mkl/blas.hxx
@@ -261,7 +261,7 @@ 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);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/blas_ct_backends.hxx b/include/oneapi/mkl/blas/detail/blas_ct_backends.hxx
@@ -413,7 +413,7 @@ 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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/blas_loader.hxx b/include/oneapi/mkl/blas/detail/blas_loader.hxx
@@ -396,7 +396,7 @@ ONEMKL_EXPORT void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, tran
                         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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/cublas/blas_ct.hxx b/include/oneapi/mkl/blas/detail/cublas/blas_ct.hxx
@@ -743,7 +743,7 @@ 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);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hxx b/include/oneapi/mkl/blas/detail/cublas/onemkl_blas_cublas.hxx
@@ -496,7 +496,7 @@ 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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hxx b/include/oneapi/mkl/blas/detail/mklcpu/blas_ct.hxx
@@ -743,7 +743,7 @@ 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);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/mklgpu/blas_ct.hxx b/include/oneapi/mkl/blas/detail/mklgpu/blas_ct.hxx
@@ -743,7 +743,7 @@ 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);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/netlib/blas_ct.hxx b/include/oneapi/mkl/blas/detail/netlib/blas_ct.hxx
@@ -743,7 +743,7 @@ 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);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/detail/onemkl_blas_backends.hxx b/include/oneapi/mkl/blas/detail/onemkl_blas_backends.hxx
@@ -46,7 +46,7 @@ ONEMKL_EXPORT void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa,
                         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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/include/oneapi/mkl/blas/predicates.hxx b/include/oneapi/mkl/blas/predicates.hxx
@@ -1518,7 +1518,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
 #endif
 }
 
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 inline void gemm_precondition(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,
@@ -4750,7 +4750,7 @@ inline void gemm_postcondition(cl::sycl::queue &queue, transpose transa, transpo
     /* add postchecks to queue here for input args.  */
 #endif
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 inline void gemm_precondition(cl::sycl::queue &queue, transpose transa, transpose transb,
                               std::int64_t m, std::int64_t n, std::int64_t k, half alpha,
                               const half *a, std::int64_t lda, const half *b, std::int64_t ldb,
diff --git a/src/blas/backends/cublas/cublas_level3.cpp b/src/blas/backends/cublas/cublas_level3.cpp
@@ -109,7 +109,7 @@ inline void gemm(Func func, DATATYPE_A DT_A, DATATYPE_B DT_B, DATATYPE_C DT_C,
         gemm(CUBLAS_ROUTINE, CUDADATATYPE_A, CUDADATATYPE_B, CUDADATATYPE_C, queue, transa,      \
              transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);                              \
     }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 GEMM_EX_LAUNCHER(half, half, float, cublasGemmEx, CUDA_R_16F, CUDA_R_16F, CUDA_R_32F)
 GEMM_EX_LAUNCHER(half, half, half, cublasGemmEx, CUDA_R_16F, CUDA_R_16F, CUDA_R_16F)
 #endif
@@ -465,7 +465,7 @@ GEMM_LAUNCHER_USM(std::complex<float>, cublasCgemm)
 GEMM_LAUNCHER_USM(std::complex<double>, cublasZgemm)
 
 #undef GEMM_LAUNCHER_USM
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 cl::sycl::event gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
                      std::int64_t n, std::int64_t k, half alpha, const half *a, std::int64_t lda,
                      const half *b, std::int64_t ldb, half beta, half *c, std::int64_t ldc,
@@ -860,7 +860,7 @@ inline void gemm(Func func, DATATYPE_A DT_A, DATATYPE_B DT_B, DATATYPE_C DT_C,
         gemm(CUBLAS_ROUTINE, CUDADATATYPE_A, CUDADATATYPE_B, CUDADATATYPE_C, queue, transa,      \
              transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);                              \
     }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 GEMM_EX_LAUNCHER(half, half, float, cublasGemmEx, CUDA_R_16F, CUDA_R_16F, CUDA_R_32F)
 GEMM_EX_LAUNCHER(half, half, half, cublasGemmEx, CUDA_R_16F, CUDA_R_16F, CUDA_R_16F)
 #endif
@@ -1065,7 +1065,7 @@ GEMM_LAUNCHER_USM(std::complex<float>, cublasCgemm)
 GEMM_LAUNCHER_USM(std::complex<double>, cublasZgemm)
 
 #undef GEMM_LAUNCHER_USM
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 cl::sycl::event gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,
                      std::int64_t n, std::int64_t k, half alpha, const half *a, std::int64_t lda,
                      const half *b, std::int64_t ldb, half beta, half *c, std::int64_t ldc,
diff --git a/src/blas/backends/cublas/mkl_blas_cublas_wrappers.cpp b/src/blas/backends/cublas/mkl_blas_cublas_wrappers.cpp
@@ -147,7 +147,7 @@ extern "C" blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::cublas::column_major::gemm,
     oneapi::mkl::blas::cublas::column_major::gemm,
     oneapi::mkl::blas::cublas::column_major::gemm,
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::cublas::column_major::gemm,
     oneapi::mkl::blas::cublas::column_major::gemm,
 #endif
@@ -480,7 +480,7 @@ extern "C" blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::cublas::row_major::gemm,
     oneapi::mkl::blas::cublas::row_major::gemm,
     oneapi::mkl::blas::cublas::row_major::gemm,
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::cublas::row_major::gemm,
     oneapi::mkl::blas::cublas::row_major::gemm,
 #endif
diff --git a/src/blas/backends/mklcpu/mklcpu_level3.cxx b/src/blas/backends/mklcpu/mklcpu_level3.cxx
@@ -96,7 +96,7 @@ void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, int64_t m,
         });
     });
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, int64_t m, int64_t n,
           int64_t k, half alpha, cl::sycl::buffer<half, 1> &a, int64_t lda,
           cl::sycl::buffer<half, 1> &b, int64_t ldb, half beta, cl::sycl::buffer<half, 1> &c,
diff --git a/src/blas/backends/mklcpu/mklcpu_wrappers.cpp b/src/blas/backends/mklcpu/mklcpu_wrappers.cpp
@@ -148,7 +148,7 @@ extern "C" ONEMKL_EXPORT blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::mklcpu::column_major::gemm,
     oneapi::mkl::blas::mklcpu::column_major::gemm,
     oneapi::mkl::blas::mklcpu::column_major::gemm,
-    #ifndef DISABLE_HALF_RUTINES
+    #ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::mklcpu::column_major::gemm,
     oneapi::mkl::blas::mklcpu::column_major::gemm,
     #endif
@@ -481,7 +481,7 @@ extern "C" ONEMKL_EXPORT blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::mklcpu::row_major::gemm,
     oneapi::mkl::blas::mklcpu::row_major::gemm,
     oneapi::mkl::blas::mklcpu::row_major::gemm,
-    #ifndef DISABLE_HALF_RUTINES
+    #ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::mklcpu::row_major::gemm,
     oneapi::mkl::blas::mklcpu::row_major::gemm,
     #endif
diff --git a/src/blas/backends/mklgpu/mklgpu_common.hpp b/src/blas/backends/mklgpu/mklgpu_common.hpp
@@ -779,7 +779,7 @@ void cgemmt(cl::sycl::queue &queue, MKL_LAYOUT layout, MKL_UPLO upper_lower, MKL
             cl::sycl::buffer<std::complex<float>, 1> &a, int64_t lda,
             cl::sycl::buffer<std::complex<float>, 1> &b, int64_t ldb, std::complex<float> beta,
             cl::sycl::buffer<std::complex<float>, 1> &c, int64_t ldc);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 void hgemm(cl::sycl::queue &queue, MKL_LAYOUT layout, MKL_TRANSPOSE transa, MKL_TRANSPOSE transb,
            int64_t m, int64_t n, int64_t k, half alpha, cl::sycl::buffer<half, 1> &a, int64_t lda,
            cl::sycl::buffer<half, 1> &b, int64_t ldb, half beta, cl::sycl::buffer<half, 1> &c,
diff --git a/src/blas/backends/mklgpu/mklgpu_level3.cxx b/src/blas/backends/mklgpu/mklgpu_level3.cxx
@@ -56,7 +56,7 @@ void gemm(cl::sycl::queue &queue, oneapi::mkl::transpose transa, oneapi::mkl::tr
                               ::mkl::cblas_convert(transb), m, n, k, alpha, a, lda, b, ldb, beta, c,
                               ldc);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/src/blas/backends/mklgpu/mklgpu_wrappers.cpp b/src/blas/backends/mklgpu/mklgpu_wrappers.cpp
@@ -148,7 +148,7 @@ extern "C" ONEMKL_EXPORT blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::mklgpu::column_major::gemm,
     oneapi::mkl::blas::mklgpu::column_major::gemm,
     oneapi::mkl::blas::mklgpu::column_major::gemm,
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::mklgpu::column_major::gemm,
     oneapi::mkl::blas::mklgpu::column_major::gemm,
 #endif
@@ -481,7 +481,7 @@ extern "C" ONEMKL_EXPORT blas_function_table_t mkl_blas_table = {
     oneapi::mkl::blas::mklgpu::row_major::gemm,
     oneapi::mkl::blas::mklgpu::row_major::gemm,
     oneapi::mkl::blas::mklgpu::row_major::gemm,
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     oneapi::mkl::blas::mklgpu::row_major::gemm,
     oneapi::mkl::blas::mklgpu::row_major::gemm,
 #endif
diff --git a/src/blas/blas_loader.cpp b/src/blas/blas_loader.cpp
@@ -877,7 +877,7 @@ void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, transpose transa,
     function_tables[libkey].column_major_zgemm_sycl(queue, transa, transb, m, n, k, alpha, a, lda,
                                                     b, ldb, beta, c, ldc);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
@@ -3495,7 +3495,7 @@ void gemm(oneapi::mkl::device libkey, cl::sycl::queue &queue, transpose transa,
     function_tables[libkey].row_major_zgemm_sycl(queue, transa, transb, m, n, k, alpha, a, lda, b,
                                                  ldb, beta, c, ldc);
 }
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
 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,
diff --git a/src/blas/function_table.hpp b/src/blas/function_table.hpp
@@ -568,7 +568,7 @@ typedef struct {
                                     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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     void (*column_major_hgemm_sycl)(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,
@@ -2090,7 +2090,7 @@ typedef struct {
                                  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);
-#ifndef DISABLE_HALF_RUTINES
+#ifdef ENABLE_HALF_ROUTINES
     void (*row_major_hgemm_sycl)(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,
diff --git a/src/config.hpp.in b/src/config.hpp.in
@@ -25,7 +25,7 @@
 #cmakedefine ENABLE_MKLCPU_BACKEND
 #cmakedefine ENABLE_MKLGPU_BACKEND
 #cmakedefine ENABLE_NETLIB_BACKEND
-#cmakedefine DISABLE_HALF_RUTINES
+#cmakedefine ENABLE_HALF_ROUTINES
 #cmakedefine BUILD_SHARED_LIBS
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose tran`
`261`	`261`	`c, ldc);`
`262`	`262`	`gemm_postcondition(queue, transa, transb, m, n, k, alpha, a, lda, b, ldb, beta, c, ldc);`
`263`	`263`	`}`
`264`		`-#ifndef DISABLE_HALF_RUTINES`
	`264`	`+#ifdef ENABLE_HALF_ROUTINES`
`265`	`265`	`static inline void gemm(cl::sycl::queue &queue, transpose transa, transpose transb, std::int64_t m,`
`266`	`266`	`std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,`
`267`	`267`	`std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,`
Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ void gemm(backend_selector<backend::cublas> selector, transpose transa, transpos`
`743`	`743`	`gemm_postcondition(selector.get_queue(), transa, transb, m, n, k, alpha, a, lda, b, ldb, beta,`
`744`	`744`	`c, ldc);`
`745`	`745`	`}`
`746`		`-#ifndef DISABLE_HALF_RUTINES`
	`746`	`+#ifdef ENABLE_HALF_ROUTINES`
`747`	`747`	`void gemm(backend_selector<backend::cublas> selector, transpose transa, transpose transb,`
`748`	`748`	`std::int64_t m, std::int64_t n, std::int64_t k, half alpha, cl::sycl::buffer<half, 1> &a,`
`749`	`749`	`std::int64_t lda, cl::sycl::buffer<half, 1> &b, std::int64_t ldb, half beta,`