diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-04-29 13:41:26 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-04-29 13:41:26 -0700 |
| commit | 07a247dcf4e86f9f741b68e1d8e0897de3eeca57 (patch) | |
| tree | d103bd20faa1f103035bac2f21507ecc65f97f68 /bench/tensors/tensor_benchmarks.h | |
| parent | fa5a8f055aebbf4f39fca26e857351103fab4d11 (diff) | |
| parent | 0f3c4c8ff4a6635db77195a8919c743f34181cc2 (diff) | |
Pulled latest updates from upstream
Diffstat (limited to 'bench/tensors/tensor_benchmarks.h')
| -rw-r--r-- | bench/tensors/tensor_benchmarks.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bench/tensors/tensor_benchmarks.h b/bench/tensors/tensor_benchmarks.h index 90b9bc741..62533a608 100644 --- a/bench/tensors/tensor_benchmarks.h +++ b/bench/tensors/tensor_benchmarks.h @@ -201,9 +201,15 @@ template <typename Device, typename T> class BenchmarkSuite { size_b[1] = k_/2; TensorMap<Tensor<T, 2>, Eigen::Aligned> B(b_, size_b); +#ifndef EIGEN_HAS_INDEX_LIST Eigen::array<TensorIndex, 2> strides; strides[0] = 1; strides[1] = 2; +#else + // Take advantage of cxx11 to give the compiler information it can use to + // optimize the code. + Eigen::IndexList<Eigen::type2index<1>, Eigen::type2index<2> > strides; +#endif StartBenchmarkTiming(); for (int iter = 0; iter < num_iters; ++iter) { |