fix compilation without openmp

This commit is contained in:
Gael Guennebaud 2010-02-26 14:57:22 +01:00
parent c05047d28e
commit 8d4a0e6753
2 changed files with 3 additions and 1 deletions

View File

@ -87,6 +87,7 @@ static void run(int rows, int cols, int depth,
ei_gemm_pack_lhs<Scalar, Blocking::mr, LhsStorageOrder> pack_lhs; ei_gemm_pack_lhs<Scalar, Blocking::mr, LhsStorageOrder> pack_lhs;
ei_gebp_kernel<Scalar, Blocking::mr, Blocking::nr, ei_conj_helper<ConjugateLhs,ConjugateRhs> > gebp; ei_gebp_kernel<Scalar, Blocking::mr, Blocking::nr, ei_conj_helper<ConjugateLhs,ConjugateRhs> > gebp;
#ifdef EIGEN_HAS_OPENMP
if(info) if(info)
{ {
// this is the parallel version! // 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); ei_aligned_stack_delete(Scalar, w, sizeW);
} }
else else
#endif
{ {
// this is the sequential version! // this is the sequential version!
Scalar* blockA = ei_aligned_stack_new(Scalar, kc*mc); Scalar* blockA = ei_aligned_stack_new(Scalar, kc*mc);

View File

@ -101,7 +101,7 @@ template<bool Parallelize,typename Functor>
void ei_run_parallel_gemm(const Functor& func, int rows, int cols) void ei_run_parallel_gemm(const Functor& func, int rows, int cols)
{ {
#ifndef EIGEN_HAS_OPENMP #ifndef EIGEN_HAS_OPENMP
func(0,size1, 0,size2); func(0,rows, 0,cols);
#else #else
int threads = omp_get_max_threads(); int threads = omp_get_max_threads();