aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/products/Parallelizer.h
diff options
context:
space:
mode:
authorGravatar karturov <karturov@KARTUROV-MOBL.ccr.corp.intel.com>2011-12-05 14:52:21 +0700
committerGravatar karturov <karturov@KARTUROV-MOBL.ccr.corp.intel.com>2011-12-05 14:52:21 +0700
commit015c331252a3b99c187b5607572f1cec531a4d1e (patch)
treee30a3f64a950edd21ae89f667cb2f859b6479c02 /Eigen/src/Core/products/Parallelizer.h
parente270a5656aaafb055702a51a63541e05eabd8936 (diff)
Intel(R) MKL support added.
* * * License disclaimer changed to BSD license for MKL_support.h * * * Pardiso support fixed, test added. blas/lapack tests fixed: Scalar parameter was added in Cholesky, product_matrix_vector_triangular remaned to triangular_matrix_vector_product. * * * PARDISO test was added physically.
Diffstat (limited to 'Eigen/src/Core/products/Parallelizer.h')
-rw-r--r--Eigen/src/Core/products/Parallelizer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h
index ecdedc363..d002f6d2e 100644
--- a/Eigen/src/Core/products/Parallelizer.h
+++ b/Eigen/src/Core/products/Parallelizer.h
@@ -85,7 +85,7 @@ template<typename Index> struct GemmParallelInfo
template<bool Condition, typename Functor, typename Index>
void parallelize_gemm(const Functor& func, Index rows, Index cols, bool transpose)
{
-#ifndef EIGEN_HAS_OPENMP
+#if !(defined (EIGEN_HAS_OPENMP)) || defined (EIGEN_MKL)
// FIXME the transpose variable is only needed to properly split
// the matrix product when multithreading is enabled. This is a temporary
// fix to support row-major destination matrices. This whole