diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
commit | 50fde02b422a1a1dbc71a7bc95a061e46ce73b33 (patch) | |
tree | 631d2de1db5a6321241685f8015f740da64c7a85 /extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h | |
parent | 85bbf7e04f2694a160219e07fb44711f157e6237 (diff) | |
parent | dc98a3b0a74b0e91ad424195ce488a9b14f13e73 (diff) |
Merge branch 'master' into GPencil_Editing_Stage3
Conflicts:
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h')
-rw-r--r-- | extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h b/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h index ba41a1c99f6..4cc56a42fd5 100644 --- a/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h +++ b/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h @@ -109,7 +109,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,true, \ /* Non-square case - doesn't fit to MKL ?TRMM. Fall to default triangular product or call MKL ?GEMM*/ \ if (rows != depth) { \ \ - int nthr = mkl_domain_get_max_threads(MKL_BLAS); \ + int nthr = mkl_domain_get_max_threads(EIGEN_MKL_DOMAIN_BLAS); \ \ if (((nthr==1) && (((std::max)(rows,depth)-diagSize)/(double)diagSize < 0.5))) { \ /* Most likely no benefit to call TRMM or GEMM from MKL*/ \ @@ -223,7 +223,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,false, \ /* Non-square case - doesn't fit to MKL ?TRMM. Fall to default triangular product or call MKL ?GEMM*/ \ if (cols != depth) { \ \ - int nthr = mkl_domain_get_max_threads(MKL_BLAS); \ + int nthr = mkl_domain_get_max_threads(EIGEN_MKL_DOMAIN_BLAS); \ \ if ((nthr==1) && (((std::max)(cols,depth)-diagSize)/(double)diagSize < 0.5)) { \ /* Most likely no benefit to call TRMM or GEMM from MKL*/ \ |