diff options
Diffstat (limited to 'unsupported/Eigen')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h | 4 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h index 675201d23..c492e7886 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h @@ -791,7 +791,7 @@ struct TensorEvaluator<const TensorContractionOp<Indices, LeftArgType, RightArgT // The underlying GEMM kernel assumes that k is a multiple of 8 and // subtle breakage occurs if this is violated. Index block_size = 8 * divup<Index>(k, 8 * num_threads); - int num_blocks = divup<Index>(k, block_size); + int num_blocks = internal::convert_index<int>(divup<Index>(k, block_size)); // we use 'result' for the first block's partial result. MaxSizeVector<Scalar*> block_buffers(num_blocks - 1); Barrier barrier(num_blocks); @@ -864,7 +864,7 @@ struct TensorEvaluator<const TensorContractionOp<Indices, LeftArgType, RightArgT // result. double reduction_cost = TensorCostModel<ThreadPoolDevice>::totalCost( m * n, TensorOpCost(2, 1, 1, true, output_packet_size)); - Index num_threads = 1; + int num_threads = 1; double min_cost = total_parallel_cost; double kPerThreadOverHead = 4000; double kFixedOverHead = 100000; diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h index 9bd6a175d..8c8ea0ed0 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h +++ b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h @@ -97,7 +97,7 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface { } } - void Schedule(std::function<void()> fn) { + void Schedule(std::function<void()> fn) EIGEN_OVERRIDE { ScheduleWithHint(std::move(fn), 0, num_threads_); } @@ -134,7 +134,7 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface { } } - void Cancel() { + void Cancel() EIGEN_OVERRIDE { cancelled_ = true; done_ = true; @@ -149,9 +149,9 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface { ec_.Notify(true); } - int NumThreads() const final { return num_threads_; } + int NumThreads() const EIGEN_FINAL { return num_threads_; } - int CurrentThreadId() const final { + int CurrentThreadId() const EIGEN_FINAL { const PerThread* pt = const_cast<ThreadPoolTempl*>(this)->GetPerThread(); if (pt->pool == this) { return pt->thread_id; |