diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-01-27 15:37:03 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-01-27 15:37:03 -0800 |
| commit | 291069e885dccad6059e4bda34aad30ab69cbd85 (patch) | |
| tree | df291d510099ec9b22d4ee505cbeb6495f0ec2d7 | |
| parent | 47ca9dc809801b60c1bfe49b391a37bd62eb8888 (diff) | |
Fixed some compilation problems with nvcc + clang
| -rw-r--r-- | Eigen/src/Core/util/Memory.h | 6 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 823e077af..415bc48cb 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -526,9 +526,9 @@ template<typename T, bool Align> EIGEN_DEVICE_FUNC inline void conditional_align template<int Alignment, typename Scalar, typename Index> EIGEN_DEVICE_FUNC inline Index first_aligned(const Scalar* array, Index size) { - static const Index ScalarSize = sizeof(Scalar); - static const Index AlignmentSize = Alignment / ScalarSize; - static const Index AlignmentMask = AlignmentSize-1; + const Index ScalarSize = sizeof(Scalar); + const Index AlignmentSize = Alignment / ScalarSize; + const Index AlignmentMask = AlignmentSize-1; if(AlignmentSize<=1) { diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index 09ee0c2c6..7a5dfbfea 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -346,7 +346,7 @@ struct InnerReducer { static const bool HasOptimizedImplementation = false; static void run(const Self&, Op&, const Device&, typename Self::CoeffReturnType*, typename Self::Index, typename Self::Index) { - assert(false && "Not implemented"); + eigen_assert(false && "Not implemented"); } }; @@ -356,7 +356,7 @@ struct OuterReducer { static const bool HasOptimizedImplementation = false; static void run(const Self&, Op&, const Device&, typename Self::CoeffReturnType*, typename Self::Index, typename Self::Index) { - assert(false && "Not implemented"); + eigen_assert(false && "Not implemented"); } }; |