Remove deprecation annotation from typedef Eigen::Index Index, as it would generate too many build warnings.

This commit is contained in:
Rasmus Munk Larsen 2019-04-24 08:50:07 -07:00
parent a7b7f3ca8a
commit 144ca33321
2 changed files with 3 additions and 3 deletions

View File

@ -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;

View File

@ -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);