[arrayfire] 66/408: Also use the void* interface for MKL on windows

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository arrayfire.

commit c9fbfc5efe1b964e1624418e89561238a4cf0e7c
Author: Keno Fischer <kfischer at college.harvard.edu>
Date:   Tue Jun 30 15:07:01 2015 -0400

    Also use the void* interface for MKL on windows
---
 src/backend/cpu/blas.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/cpu/blas.cpp b/src/backend/cpu/blas.cpp
index 59af249..39fa32b 100644
--- a/src/backend/cpu/blas.cpp
+++ b/src/backend/cpu/blas.cpp
@@ -60,7 +60,7 @@ template<> FUNC##_func_def<TYPE, BASE_TYPE>     FUNC##_func<TYPE, BASE_TYPE>()
 { return &cblas_##PREFIX##FUNC; }
 
 BLAS_FUNC_DEF( gemm )
-#if defined(OS_WIN) || defined(IS_OPENBLAS)
+#if (defined(OS_WIN) && !defined(USE_MKL)) || defined(IS_OPENBLAS)
 BLAS_FUNC(gemm , float   , float  , s)
 BLAS_FUNC(gemm , double  , double , d)
 BLAS_FUNC(gemm , cfloat  , float  , c)
@@ -73,7 +73,7 @@ BLAS_FUNC(gemm , cdouble ,   void, z)
 #endif
 
 BLAS_FUNC_DEF(gemv)
-#if defined(OS_WIN) || defined(IS_OPENBLAS)
+#if (defined(OS_WIN) && !defined(USE_MKL)) || defined(IS_OPENBLAS)
 BLAS_FUNC(gemv , float   ,  float , s)
 BLAS_FUNC(gemv , double  ,  double, d)
 BLAS_FUNC(gemv , cfloat  ,  float , c)
@@ -113,7 +113,7 @@ toCblasTranspose(af_mat_prop opt)
 using namespace std;
 
 
-#if defined(OS_WIN) || defined(IS_OPENBLAS)
+#if (defined(OS_WIN) && !defined(USE_MKL)) || defined(IS_OPENBLAS)
 #define BT typename af::dtype_traits<T>::base_type
 #define REINTERPRET_CAST(PTR_TYPE, X) reinterpret_cast<PTR_TYPE>((X))
 #else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git