GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-23 01:59:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove accidental changes.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2018-11-12 18:34:04 -08:00
parent 719d9aee65
commit cda479d626
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h
View File

@ -199,7 +199,7 @@ struct ThreadPoolDevice {
const Index max_block_size = numext::mini(n, 2 * block_size); const Index max_block_size = numext::mini(n, 2 * block_size);
if (block_align) { if (block_align) {
Index new_block_size = block_align(block_size); Index new_block_size = block_align(block_size);
eigen_plain_assert(new_block_size >= block_size); eigen_assert(new_block_size >= block_size);
block_size = numext::mini(n, new_block_size); block_size = numext::mini(n, new_block_size);
} }
Index block_count = divup(n, block_size); Index block_count = divup(n, block_size);
@ -217,7 +217,7 @@ struct ThreadPoolDevice {
Index coarser_block_size = divup(n, prev_block_count - 1); Index coarser_block_size = divup(n, prev_block_count - 1);
if (block_align) { if (block_align) {
Index new_block_size = block_align(coarser_block_size); Index new_block_size = block_align(coarser_block_size);
eigen_plain_assert(new_block_size >= coarser_block_size); eigen_assert(new_block_size >= coarser_block_size);
coarser_block_size = numext::mini(n, new_block_size); coarser_block_size = numext::mini(n, new_block_size);
} }
if (coarser_block_size > max_block_size) { if (coarser_block_size > max_block_size) {
@ -225,7 +225,7 @@ struct ThreadPoolDevice {
} }
// Recalculate parallel efficiency. // Recalculate parallel efficiency.
const Index coarser_block_count = divup(n, coarser_block_size); const Index coarser_block_count = divup(n, coarser_block_size);
eigen_plain_assert(coarser_block_count < prev_block_count); eigen_assert(coarser_block_count < prev_block_count);
prev_block_count = coarser_block_count; prev_block_count = coarser_block_count;
const double coarser_efficiency = const double coarser_efficiency =
static_cast<double>(coarser_block_count) / static_cast<double>(coarser_block_count) /
@ -268,8 +268,6 @@ struct ThreadPoolDevice {
barrier.Wait(); barrier.Wait();
} }
// Convenience wrapper for parallelFor that does not align blocks. // Convenience wrapper for parallelFor that does not align blocks.
void parallelFor(Index n, const TensorOpCost& cost, void parallelFor(Index n, const TensorOpCost& cost,
std::function<void(Index, Index)> f) const { std::function<void(Index, Index)> f) const {