diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-02-10 13:11:40 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-02-10 13:11:40 -0800 |
| commit | 769208a17ff15b94b6d8a20a6c00e2fdd7149edd (patch) | |
| tree | 3b4bb3de0f8a5469a7722abfeabf572c9a4dcaf3 /unsupported | |
| parent | 0ee97b60c256b31a98838324ce1909247a0133d2 (diff) | |
| parent | 8b3cc54c42d6f2cc7db6f2a56da0e6510782b747 (diff) | |
Pulled latest updates from upstream
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h index 71f086426..bf4a476d9 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h @@ -64,9 +64,9 @@ void pack_simple(Scalar * dst, const Scalar * src, Index cols, Index rows, Index template<typename LhsScalar, typename RhsScalar, typename Scalar> struct libxsmm_wrapper { libxsmm_wrapper() {} - libxsmm_wrapper(int flags, int m, int n, int k, int lda, int ldb, int ldc, float alpha, float beta, int prefetch) {} - void operator()(const LhsScalar* a, const RhsScalar* b, Scalar* c) {} - void operator()(const LhsScalar* a, const RhsScalar* b, Scalar* c, const LhsScalar* ap, const RhsScalar* bp, const Scalar* cp) {} + libxsmm_wrapper(int, int, int, int, int, int, int, float, float, int) {} + void operator()(const LhsScalar*, const RhsScalar*, Scalar*) {} + void operator()(const LhsScalar*, const RhsScalar*, Scalar*, const LhsScalar*, const RhsScalar*, const Scalar*) {} }; template<> @@ -682,10 +682,9 @@ protected: } m_can_use_xsmm = true; - #else - // silence the compiler warning - (void) eval_op_indices; - #endif +#else + EIGEN_UNUSED_VARIABLE(eval_op_indices); +#endif } #if defined(EIGEN_VECTORIZE_AVX) && defined(EIGEN_USE_LIBXSMM) |