Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 1272b490 authored by hhakim's avatar hhakim
Browse files

Fix preprocessor directive and eigen macro call.

parent 3b73b6af
Branches
Tags
No related merge requests found
...@@ -108,7 +108,7 @@ namespace Faust ...@@ -108,7 +108,7 @@ namespace Faust
using MatMap = Eigen::Map<Eigen::Matrix<FPP, Eigen::Dynamic, Eigen::Dynamic>>; using MatMap = Eigen::Map<Eigen::Matrix<FPP, Eigen::Dynamic, Eigen::Dynamic>>;
MatMap X_mat(const_cast<FPP*>(X) /* harmless, no modification*/, this->getNbCol(), X_ncols); MatMap X_mat(const_cast<FPP*>(X) /* harmless, no modification*/, this->getNbCol(), X_ncols);
MatMap Y_mat(Y, this->getNbRow(), X_ncols); MatMap Y_mat(Y, this->getNbRow(), X_ncols);
#ifdef BUTTERFLY_MUL_MAT_OMP_LOOP || ! (EIGEN_WORLD_VERSION > 3 || EIGEN_WORLD_VERSION >= 4 && EIGEN_MAJOR_VERSION >= 0) #if defined(BUTTERFLY_MUL_MAT_OMP_LOOP) || ! EIGEN_VERSION_AT_LEAST(3, 4, 0)
// this is slower // this is slower
#pragma parallel omp for #pragma parallel omp for
for(int i=0;i < this->getNbRow(); i ++) for(int i=0;i < this->getNbRow(); i ++)
...@@ -275,7 +275,7 @@ namespace Faust ...@@ -275,7 +275,7 @@ namespace Faust
MatMap X_mat(const_cast<FPP*>(X) /* harmless, no modification*/, Y_nrows, X_ncols); MatMap X_mat(const_cast<FPP*>(X) /* harmless, no modification*/, Y_nrows, X_ncols);
MatMap Y_mat(Y, Y_nrows, X_ncols); MatMap Y_mat(Y, Y_nrows, X_ncols);
const FPP *d1_ptr = D1.diagonal().data(), *d2_ptr = D2.diagonal().data(); const FPP *d1_ptr = D1.diagonal().data(), *d2_ptr = D2.diagonal().data();
#ifdef BMAT_MULTIPLY_MAT_OMP_LOOP || ! (EIGEN_WORLD_VERSION > 3 || EIGEN_WORLD_VERSION >= 4 && EIGEN_MAJOR_VERSION >= 0) #if defined(BUTTERFLY_MUL_MAT_OMP_LOOP) || ! EIGEN_VERSION_AT_LEAST(3, 4, 0)
// this is slower // this is slower
#pragma omp parallel for #pragma omp parallel for
for(int i=0;i < Y_nrows; i++) for(int i=0;i < Y_nrows; i++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment