diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-19 12:56:12 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-19 12:56:12 -0700 |
commit | d3943cd50c99d7169c3d5a1ea4aa4d8660190e2d (patch) | |
tree | 2081d7cc6e4c7edf618cf7728e5923f56e75547c | |
parent | 692b30ca95397cbb42c53c813cf5dd4b7f0acc8d (diff) |
Fixed a few typos in the ternary tensor expressions types
-rw-r--r-- | Eigen/Core | 4 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Eigen/Core b/Eigen/Core index fcc107721..d4274770e 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -37,6 +37,10 @@ // All functions callable from CUDA code must be qualified with __device__ #define EIGEN_DEVICE_FUNC __host__ __device__ + // We need math_functions.hpp to ensure that that EIGEN_USING_STD_MATH macro + // works properly on the device side + #include <math_functions.hpp> + #else #define EIGEN_DEVICE_FUNC diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h index 61c111cec..f0383c6bf 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h @@ -495,7 +495,7 @@ struct TensorEvaluator<const TensorCwiseTernaryOp<TernaryOp, Arg1Type, Arg2Type, private: const TernaryOp m_functor; TensorEvaluator<Arg1Type, Device> m_arg1Impl; - TensorEvaluator<Arg1Type, Device> m_arg2Impl; + TensorEvaluator<Arg2Type, Device> m_arg2Impl; TensorEvaluator<Arg3Type, Device> m_arg3Impl; }; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h index 5f2e329f2..85dfc7a69 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h @@ -283,7 +283,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A arg1Expression() const { return m_arg1_xpr; } EIGEN_DEVICE_FUNC - const typename internal::remove_all<typename Arg1XprType::Nested>::type& + const typename internal::remove_all<typename Arg2XprType::Nested>::type& arg2Expression() const { return m_arg2_xpr; } EIGEN_DEVICE_FUNC @@ -292,7 +292,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A protected: typename Arg1XprType::Nested m_arg1_xpr; - typename Arg1XprType::Nested m_arg2_xpr; + typename Arg2XprType::Nested m_arg2_xpr; typename Arg3XprType::Nested m_arg3_xpr; const TernaryOp m_functor; }; |