diff options
| -rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrix.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/products/Parallelizer.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index ca3d1d200..6f7dee743 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -87,6 +87,7 @@ static void run(int rows, int cols, int depth, ei_gemm_pack_lhs<Scalar, Blocking::mr, LhsStorageOrder> pack_lhs; ei_gebp_kernel<Scalar, Blocking::mr, Blocking::nr, ei_conj_helper<ConjugateLhs,ConjugateRhs> > gebp; + #ifdef EIGEN_HAS_OPENMP if(info) { // this is the parallel version! @@ -145,6 +146,7 @@ static void run(int rows, int cols, int depth, ei_aligned_stack_delete(Scalar, w, sizeW); } else + #endif { // this is the sequential version! Scalar* blockA = ei_aligned_stack_new(Scalar, kc*mc); diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h index e7a940992..ad998572b 100644 --- a/Eigen/src/Core/products/Parallelizer.h +++ b/Eigen/src/Core/products/Parallelizer.h @@ -101,7 +101,7 @@ template<bool Parallelize,typename Functor> void ei_run_parallel_gemm(const Functor& func, int rows, int cols) { #ifndef EIGEN_HAS_OPENMP - func(0,size1, 0,size2); + func(0,rows, 0,cols); #else int threads = omp_get_max_threads(); |