aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/products
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2016-10-14 17:16:28 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2016-10-14 17:16:28 +0200
commit692b30ca95397cbb42c53c813cf5dd4b7f0acc8d (patch)
tree22d930b67a7aefc674d43c3020a804dbfbf2e72a /Eigen/src/Core/products
parent050c681bdd3199e50e14962aa1a2c08acd57741b (diff)
Fix previous merge.
Diffstat (limited to 'Eigen/src/Core/products')
-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 1dee8d714..2a31e4cbe 100644
--- a/Eigen/src/Core/products/Parallelizer.h
+++ b/Eigen/src/Core/products/Parallelizer.h
@@ -111,7 +111,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
double work = static_cast<double>(rows) * static_cast<double>(cols) *
static_cast<double>(depth);
double kMinTaskSize = 50000; // Heuristic.
- max_threads = std::max<Index>(1, std::min<Index>(max_threads, work / kMinTaskSize));
+ pb_max_threads = std::max<Index>(1, std::min<Index>(pb_max_threads, work / kMinTaskSize));
// compute the number of threads we are going to use
Index threads = std::min<Index>(nbThreads(), pb_max_threads);