diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-10-30 20:16:16 +0100 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-10-30 20:16:16 +0100 |
| commit | 883168ed94ca2559231861957558a9ded13e4831 (patch) | |
| tree | 347dc5bbf3b31353844bcafb6149a5cd974c21e0 /Eigen/src/Core/Select.h | |
| parent | e5f134006b431d7d307c8ce7706c5aa1df09895c (diff) | |
Make select CUDA compatible (comparison operators aren't yet, so no test case yet)
Diffstat (limited to 'Eigen/src/Core/Select.h')
| -rw-r--r-- | Eigen/src/Core/Select.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Eigen/src/Core/Select.h b/Eigen/src/Core/Select.h index 0cb85a4ad..0c09a4ff4 100644 --- a/Eigen/src/Core/Select.h +++ b/Eigen/src/Core/Select.h @@ -57,6 +57,7 @@ class Select : internal::no_assignment_operator, typedef typename internal::dense_xpr_base<Select>::type Base; EIGEN_DENSE_PUBLIC_INTERFACE(Select) + inline EIGEN_DEVICE_FUNC Select(const ConditionMatrixType& a_conditionMatrix, const ThenMatrixType& a_thenMatrix, const ElseMatrixType& a_elseMatrix) @@ -66,9 +67,10 @@ class Select : internal::no_assignment_operator, eigen_assert(m_condition.cols() == m_then.cols() && m_condition.cols() == m_else.cols()); } - Index rows() const { return m_condition.rows(); } - Index cols() const { return m_condition.cols(); } + inline EIGEN_DEVICE_FUNC Index rows() const { return m_condition.rows(); } + inline EIGEN_DEVICE_FUNC Index cols() const { return m_condition.cols(); } + inline EIGEN_DEVICE_FUNC const Scalar coeff(Index i, Index j) const { if (m_condition.coeff(i,j)) @@ -77,6 +79,7 @@ class Select : internal::no_assignment_operator, return m_else.coeff(i,j); } + inline EIGEN_DEVICE_FUNC const Scalar coeff(Index i) const { if (m_condition.coeff(i)) @@ -85,17 +88,17 @@ class Select : internal::no_assignment_operator, return m_else.coeff(i); } - const ConditionMatrixType& conditionMatrix() const + inline EIGEN_DEVICE_FUNC const ConditionMatrixType& conditionMatrix() const { return m_condition; } - const ThenMatrixType& thenMatrix() const + inline EIGEN_DEVICE_FUNC const ThenMatrixType& thenMatrix() const { return m_then; } - const ElseMatrixType& elseMatrix() const + inline EIGEN_DEVICE_FUNC const ElseMatrixType& elseMatrix() const { return m_else; } |