GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-20 11:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix placement of "#if defined(EIGEN_GPUCC)" guard region.

Browse Source 
Found with -Wundefined-func-template.

Author: tkoeppe@google.com
This commit is contained in:
Rasmus Munk Larsen 2019-03-06 11:42:22 -08:00
commit 41cdc370d0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h
View File

@ -56,6 +56,7 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface {
thread_data_[i].thread.reset( thread_data_[i].thread.reset(
env_.CreateThread([this, i]() { WorkerLoop(i); })); env_.CreateThread([this, i]() { WorkerLoop(i); }));
} }
global_steal_partition_ = EncodePartition(0, num_threads_);
#ifndef EIGEN_THREAD_LOCAL #ifndef EIGEN_THREAD_LOCAL
// Wait for workers to initialize per_thread_map_. Otherwise we might race // Wait for workers to initialize per_thread_map_. Otherwise we might race
// with them in Schedule or CurrentThreadId. // with them in Schedule or CurrentThreadId.
@ -237,6 +238,7 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface {
MaxSizeVector<ThreadData> thread_data_; MaxSizeVector<ThreadData> thread_data_;
MaxSizeVector<MaxSizeVector<unsigned>> all_coprimes_; MaxSizeVector<MaxSizeVector<unsigned>> all_coprimes_;
MaxSizeVector<EventCount::Waiter> waiters_; MaxSizeVector<EventCount::Waiter> waiters_;
unsigned global_steal_partition_;
std::atomic<unsigned> blocked_; std::atomic<unsigned> blocked_;
std::atomic<bool> spinning_; std::atomic<bool> spinning_;
std::atomic<bool> done_; std::atomic<bool> done_;
@ -354,6 +356,9 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface {
Task LocalSteal() { Task LocalSteal() {
PerThread* pt = GetPerThread(); PerThread* pt = GetPerThread();
unsigned partition = GetStealPartition(pt->thread_id); unsigned partition = GetStealPartition(pt->thread_id);
// If thread steal partition is the same as global partition, there is no
// need to go through the steal loop twice.
if (global_steal_partition_ == partition) return Task();
unsigned start, limit; unsigned start, limit;
DecodePartition(partition, &start, &limit); DecodePartition(partition, &start, &limit);
AssertBounds(start, limit); AssertBounds(start, limit);