diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2019-04-24 08:50:07 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-04-24 08:50:07 -0700 |
| commit | 144ca333219a043b2de87bca383f24b89308ba6f (patch) | |
| tree | 78f97cedd3514af541a82b7b3cc14f0a6dad865e | |
| parent | a7b7f3ca8a25bfef4058d8a212cdc504bf5aa50e (diff) | |
Remove deprecation annotation from typedef Eigen::Index Index, as it would generate too many build warnings.
| -rw-r--r-- | Eigen/src/Core/EigenBase.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/EigenBase.h b/Eigen/src/Core/EigenBase.h index a197d2694..b195506a9 100644 --- a/Eigen/src/Core/EigenBase.h +++ b/Eigen/src/Core/EigenBase.h @@ -35,7 +35,7 @@ template<typename Derived> struct EigenBase * \deprecated Since Eigen 3.3, its usage is deprecated. Use Eigen::Index instead. * \sa StorageIndex, \ref TopicPreprocessorDirectives. */ - EIGEN_DEPRECATED typedef Eigen::Index Index; + typedef Eigen::Index Index; // FIXME is it needed? typedef typename internal::traits<Derived>::StorageKind StorageKind; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h index 500f63e60..22db6f01b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h @@ -1191,8 +1191,8 @@ struct TensorEvaluator<const TensorContractionOp<Indices, LeftArgType, RightArgT m * n, TensorOpCost(2, 1, 1, true, output_packet_size)); int num_threads = 1; double min_cost = total_parallel_cost; - double kPerThreadOverHead = 4000; - double kFixedOverHead = 50000; + double kPerThreadOverHead = 3000; + double kFixedOverHead = 100000; for (int nt = 2; nt <= this->m_device.numThreads(); nt += 2) { double sequential_cost = kFixedOverHead + nt * (reduction_cost + kPerThreadOverHead); |