diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-04-11 15:17:14 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-04-11 15:17:14 +0200 |
| commit | 6a9ca88e7e1bb72de621806b51c5a4fd17310943 (patch) | |
| tree | f31ced3c1f2fba0e7f230b4c2acd71d1d1581c97 /Eigen/src/Core/util/MKL_support.h | |
| parent | 4e8e5888d7a78d514e54a518f6692f2838314328 (diff) | |
Relax dependency on MKL for EIGEN_USE_BLAS
Diffstat (limited to 'Eigen/src/Core/util/MKL_support.h')
| -rw-r--r-- | Eigen/src/Core/util/MKL_support.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/MKL_support.h b/Eigen/src/Core/util/MKL_support.h index 1ef3b61db..de7847fc4 100644 --- a/Eigen/src/Core/util/MKL_support.h +++ b/Eigen/src/Core/util/MKL_support.h @@ -49,7 +49,7 @@ #define EIGEN_USE_LAPACKE #endif -#if defined(EIGEN_USE_BLAS) || defined(EIGEN_USE_LAPACKE) || defined(EIGEN_USE_MKL_VML) +#if defined(EIGEN_USE_LAPACKE) || defined(EIGEN_USE_MKL_VML) #define EIGEN_USE_MKL #endif @@ -64,7 +64,6 @@ # ifndef EIGEN_USE_MKL /*If the MKL version is too old, undef everything*/ # undef EIGEN_USE_MKL_ALL -# undef EIGEN_USE_BLAS # undef EIGEN_USE_LAPACKE # undef EIGEN_USE_MKL_VML # undef EIGEN_USE_LAPACKE_STRICT @@ -107,12 +106,17 @@ #else #define EIGEN_MKL_DOMAIN_PARDISO MKL_PARDISO #endif +#endif namespace Eigen { typedef std::complex<double> dcomplex; typedef std::complex<float> scomplex; +#if defined(EIGEN_USE_BLAS) && !defined(EIGEN_USE_MKL) +typedef int MKL_INT; +#endif + namespace internal { template<typename MKLType, typename EigenType> @@ -125,6 +129,7 @@ static inline void assign_conj_scalar_eig2mkl(MKLType& mklScalar, const EigenTyp mklScalar=eigenScalar; } +#ifdef EIGEN_USE_MKL template <> inline void assign_scalar_eig2mkl<MKL_Complex16,dcomplex>(MKL_Complex16& mklScalar, const dcomplex& eigenScalar) { mklScalar.real=eigenScalar.real(); @@ -148,11 +153,14 @@ inline void assign_conj_scalar_eig2mkl<MKL_Complex8,scomplex>(MKL_Complex8& mklS mklScalar.real=eigenScalar.real(); mklScalar.imag=-eigenScalar.imag(); } +#endif } // end namespace internal } // end namespace Eigen +#if defined(EIGEN_USE_BLAS) && !defined(EIGEN_USE_MKL) +#include "../../misc/blas.h" #endif #endif // EIGEN_MKL_SUPPORT_H |