diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2019-04-23 17:23:19 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-04-23 17:23:19 -0700 |
| commit | a7b7f3ca8a25bfef4058d8a212cdc504bf5aa50e (patch) | |
| tree | b72fcb0b8127f9fa456244d63d244f2eb0ccd6d6 /unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h | |
| parent | 68a2a8c4454cfa653d1ad0ec9de729c43e6a151d (diff) | |
Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h index 7f79ac30d..195267ce8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h @@ -177,7 +177,8 @@ class TensorCostModel { double threads = (cost - kStartupCycles) / kPerThreadCycles + 0.9; // Make sure we don't invoke undefined behavior when we convert to an int. threads = numext::mini<double>(threads, GenericNumTraits<int>::highest()); - return numext::mini(max_threads, numext::maxi<int>(1, threads)); + return numext::mini(max_threads, + numext::maxi<int>(1, static_cast<int>(threads))); } // taskSize assesses parallel task size. |