diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-11-05 10:31:59 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-11-05 10:31:59 +0100 |
| commit | 1bb1a57ef724cd0ce60920b5a672949960b94536 (patch) | |
| tree | 70addc1d74f1d347792f12015fecba3300463841 /Eigen/src/QR | |
| parent | 7c9cdd6030a95f0027d5723a758e2290d0b61deb (diff) | |
| parent | ddf775363147fc7ee778b42c21b642f085193f55 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/QR')
| -rw-r--r-- | Eigen/src/QR/ColPivHouseholderQR.h | 2 | ||||
| -rw-r--r-- | Eigen/src/QR/FullPivHouseholderQR.h | 2 | ||||
| -rw-r--r-- | Eigen/src/QR/HouseholderQR.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Eigen/src/QR/ColPivHouseholderQR.h b/Eigen/src/QR/ColPivHouseholderQR.h index 905bc1935..07126a9f4 100644 --- a/Eigen/src/QR/ColPivHouseholderQR.h +++ b/Eigen/src/QR/ColPivHouseholderQR.h @@ -564,6 +564,7 @@ typename ColPivHouseholderQR<MatrixType>::HouseholderSequenceType ColPivHousehol return HouseholderSequenceType(m_qr, m_hCoeffs.conjugate()).setLength(m_nonzero_pivots); } +#ifndef __CUDACC__ /** \return the column-pivoting Householder QR decomposition of \c *this. * * \sa class ColPivHouseholderQR @@ -574,6 +575,7 @@ MatrixBase<Derived>::colPivHouseholderQr() const { return ColPivHouseholderQR<PlainObject>(eval()); } +#endif // __CUDACC__ } // end namespace Eigen diff --git a/Eigen/src/QR/FullPivHouseholderQR.h b/Eigen/src/QR/FullPivHouseholderQR.h index a0050859c..13e14db10 100644 --- a/Eigen/src/QR/FullPivHouseholderQR.h +++ b/Eigen/src/QR/FullPivHouseholderQR.h @@ -598,6 +598,7 @@ inline typename FullPivHouseholderQR<MatrixType>::MatrixQReturnType FullPivHouse return MatrixQReturnType(m_qr, m_hCoeffs, m_rows_transpositions); } +#ifndef __CUDACC__ /** \return the full-pivoting Householder QR decomposition of \c *this. * * \sa class FullPivHouseholderQR @@ -608,6 +609,7 @@ MatrixBase<Derived>::fullPivHouseholderQr() const { return FullPivHouseholderQR<PlainObject>(eval()); } +#endif // __CUDACC__ } // end namespace Eigen diff --git a/Eigen/src/QR/HouseholderQR.h b/Eigen/src/QR/HouseholderQR.h index abc61bcbb..ad156396a 100644 --- a/Eigen/src/QR/HouseholderQR.h +++ b/Eigen/src/QR/HouseholderQR.h @@ -358,6 +358,7 @@ HouseholderQR<MatrixType>& HouseholderQR<MatrixType>::compute(const MatrixType& return *this; } +#ifndef __CUDACC__ /** \return the Householder QR decomposition of \c *this. * * \sa class HouseholderQR @@ -368,6 +369,7 @@ MatrixBase<Derived>::householderQr() const { return HouseholderQR<PlainObject>(eval()); } +#endif // __CUDACC__ } // end namespace Eigen |