GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-12 17:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few typos in the ternary tensor expressions types

Browse Source
This commit is contained in:
Benoit Steiner 2016-10-19 12:56:12 -07:00
parent 692b30ca95
commit d3943cd50c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/Core
View File

@ -37,6 +37,10 @@
// All functions callable from CUDA code must be qualified with __device__ // All functions callable from CUDA code must be qualified with __device__
#define EIGEN_DEVICE_FUNC __host__ __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 #else
#define EIGEN_DEVICE_FUNC #define EIGEN_DEVICE_FUNC

2
unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h
View File

@ -495,7 +495,7 @@ struct TensorEvaluator<const TensorCwiseTernaryOp<TernaryOp, Arg1Type, Arg2Type,
private: private:
const TernaryOp m_functor; const TernaryOp m_functor;
TensorEvaluator<Arg1Type, Device> m_arg1Impl; TensorEvaluator<Arg1Type, Device> m_arg1Impl;
TensorEvaluator<Arg1Type, Device> m_arg2Impl; TensorEvaluator<Arg2Type, Device> m_arg2Impl;
TensorEvaluator<Arg3Type, Device> m_arg3Impl; TensorEvaluator<Arg3Type, Device> m_arg3Impl;
}; };

4
unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h
View File

@ -283,7 +283,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A
arg1Expression() const { return m_arg1_xpr; } arg1Expression() const { return m_arg1_xpr; }
EIGEN_DEVICE_FUNC 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; } arg2Expression() const { return m_arg2_xpr; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
@ -292,7 +292,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A
protected: protected:
typename Arg1XprType::Nested m_arg1_xpr; typename Arg1XprType::Nested m_arg1_xpr;
typename Arg1XprType::Nested m_arg2_xpr; typename Arg2XprType::Nested m_arg2_xpr;
typename Arg3XprType::Nested m_arg3_xpr; typename Arg3XprType::Nested m_arg3_xpr;
const TernaryOp m_functor; const TernaryOp m_functor;
}; };