CFD/eigen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Wshorten-64-to-32 warnings in div_ceil

Browse Source
This commit is contained in:
Charles Schlosser 2023-10-27 15:52:00 +00:00 committed by Rasmus Munk Larsen
parent 1aac9332ce
commit 6f9ad7da61
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h
View File

@ -1548,10 +1548,10 @@ struct TensorEvaluator<const TensorContractionOp<Indices, LeftArgType, RightArgT
Index nn0 = numext::div_ceil(n, bn);
Index new_tasks = numext::div_ceil(nm0, gm) * numext::div_ceil(nn0, gn);
double new_parallelism = static_cast<double>(new_tasks) /
(numext::div_ceil<int>(new_tasks, num_threads) * num_threads);
(numext::div_ceil<Index>(new_tasks, num_threads) * num_threads);
Index old_tasks = numext::div_ceil(nm0, oldgm) * numext::div_ceil(nn0, oldgn);
double old_parallelism = static_cast<double>(old_tasks) /
(numext::div_ceil<int>(old_tasks, num_threads) * num_threads);
(numext::div_ceil<Index>(old_tasks, num_threads) * num_threads);
if (new_parallelism > old_parallelism || new_parallelism == 1) return 1;
return 0;
}

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

@ -373,7 +373,7 @@ struct ThreadPoolDevice {
// computations:
double max_efficiency =
static_cast<double>(block_count) /
(numext::div_ceil<int>(block_count, numThreads()) * numThreads());
(numext::div_ceil<Index>(block_count, numThreads()) * numThreads());
// Now try to increase block size up to max_block_size as long as it
// doesn't decrease parallel efficiency.
@ -396,7 +396,7 @@ struct ThreadPoolDevice {
prev_block_count = coarser_block_count;
const double coarser_efficiency =
static_cast<double>(coarser_block_count) /
(numext::div_ceil<int>(coarser_block_count, numThreads()) * numThreads());
(numext::div_ceil<Index>(coarser_block_count, numThreads()) * numThreads());
if (coarser_efficiency + 0.01 >= max_efficiency) {
// Taking it.
block_size = coarser_block_size;