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

bug #1266: remove CUDA guards on MatrixBase::<decomposition> definitions. (those used to break old nvcc versions that we propably don't care anymore)

Browse Source
This commit is contained in:
Gael Guennebaud 2016-09-06 09:55:50 +02:00
parent e1642f485c
commit 3cb914f332
10 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Cholesky/LDLT.h
View File

@ -642,7 +642,6 @@ MatrixType LDLT<MatrixType,_UpLo>::reconstructedMatrix() const
return res; return res;
} }
#ifndef __CUDACC__
/** \cholesky_module /** \cholesky_module
* \returns the Cholesky decomposition with full pivoting without square root of \c *this * \returns the Cholesky decomposition with full pivoting without square root of \c *this
* \sa MatrixBase::ldlt() * \sa MatrixBase::ldlt()
@ -664,7 +663,6 @@ MatrixBase<Derived>::ldlt() const
{ {
return LDLT<PlainObject>(derived()); return LDLT<PlainObject>(derived());
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/Cholesky/LLT.h
View File

@ -507,7 +507,6 @@ MatrixType LLT<MatrixType,_UpLo>::reconstructedMatrix() const
return matrixL() * matrixL().adjoint().toDenseMatrix(); return matrixL() * matrixL().adjoint().toDenseMatrix();
} }
#ifndef __CUDACC__
/** \cholesky_module /** \cholesky_module
* \returns the LLT decomposition of \c *this * \returns the LLT decomposition of \c *this
* \sa SelfAdjointView::llt() * \sa SelfAdjointView::llt()
@ -529,7 +528,6 @@ SelfAdjointView<MatrixType, UpLo>::llt() const
{ {
return LLT<PlainObject,UpLo>(m_matrix); return LLT<PlainObject,UpLo>(m_matrix);
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/LU/FullPivLU.h
View File

@ -879,14 +879,12 @@ struct Assignment<DstXprType, Inverse<FullPivLU<MatrixType> >, internal::assign_
* *
* \sa class FullPivLU * \sa class FullPivLU
*/ */
#ifndef __CUDACC__
template<typename Derived> template<typename Derived>
inline const FullPivLU<typename MatrixBase<Derived>::PlainObject> inline const FullPivLU<typename MatrixBase<Derived>::PlainObject>
MatrixBase<Derived>::fullPivLu() const MatrixBase<Derived>::fullPivLu() const
{ {
return FullPivLU<PlainObject>(eval()); return FullPivLU<PlainObject>(eval());
} }
#endif
} // end namespace Eigen } // end namespace Eigen

4
Eigen/src/LU/PartialPivLU.h
View File

@ -584,14 +584,12 @@ struct Assignment<DstXprType, Inverse<PartialPivLU<MatrixType> >, internal::assi
* *
* \sa class PartialPivLU * \sa class PartialPivLU
*/ */
#ifndef __CUDACC__
template<typename Derived> template<typename Derived>
inline const PartialPivLU<typename MatrixBase<Derived>::PlainObject> inline const PartialPivLU<typename MatrixBase<Derived>::PlainObject>
MatrixBase<Derived>::partialPivLu() const MatrixBase<Derived>::partialPivLu() const
{ {
return PartialPivLU<PlainObject>(eval()); return PartialPivLU<PlainObject>(eval());
} }
#endif
/** \lu_module /** \lu_module
* *
@ -601,14 +599,12 @@ MatrixBase<Derived>::partialPivLu() const
* *
* \sa class PartialPivLU * \sa class PartialPivLU
*/ */
#ifndef __CUDACC__
template<typename Derived> template<typename Derived>
inline const PartialPivLU<typename MatrixBase<Derived>::PlainObject> inline const PartialPivLU<typename MatrixBase<Derived>::PlainObject>
MatrixBase<Derived>::lu() const MatrixBase<Derived>::lu() const
{ {
return PartialPivLU<PlainObject>(eval()); return PartialPivLU<PlainObject>(eval());
} }
#endif
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/QR/ColPivHouseholderQR.h
View File

@ -637,7 +637,6 @@ typename ColPivHouseholderQR<MatrixType>::HouseholderSequenceType ColPivHousehol
return HouseholderSequenceType(m_qr, m_hCoeffs.conjugate()); return HouseholderSequenceType(m_qr, m_hCoeffs.conjugate());
} }
#ifndef __CUDACC__
/** \return the column-pivoting Householder QR decomposition of \c *this. /** \return the column-pivoting Householder QR decomposition of \c *this.
* *
* \sa class ColPivHouseholderQR * \sa class ColPivHouseholderQR
@ -648,7 +647,6 @@ MatrixBase<Derived>::colPivHouseholderQr() const
{ {
return ColPivHouseholderQR<PlainObject>(eval()); return ColPivHouseholderQR<PlainObject>(eval());
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/QR/CompleteOrthogonalDecomposition.h
View File

@ -547,7 +547,6 @@ CompleteOrthogonalDecomposition<MatrixType>::householderQ() const {
return m_cpqr.householderQ(); return m_cpqr.householderQ();
} }
#ifndef __CUDACC__
/** \return the complete orthogonal decomposition of \c *this. /** \return the complete orthogonal decomposition of \c *this.
* *
* \sa class CompleteOrthogonalDecomposition * \sa class CompleteOrthogonalDecomposition
@ -557,7 +556,6 @@ const CompleteOrthogonalDecomposition<typename MatrixBase<Derived>::PlainObject>
MatrixBase<Derived>::completeOrthogonalDecomposition() const { MatrixBase<Derived>::completeOrthogonalDecomposition() const {
return CompleteOrthogonalDecomposition<PlainObject>(eval()); return CompleteOrthogonalDecomposition<PlainObject>(eval());
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/QR/FullPivHouseholderQR.h
View File

@ -660,7 +660,6 @@ inline typename FullPivHouseholderQR<MatrixType>::MatrixQReturnType FullPivHouse
return MatrixQReturnType(m_qr, m_hCoeffs, m_rows_transpositions); return MatrixQReturnType(m_qr, m_hCoeffs, m_rows_transpositions);
} }
#ifndef __CUDACC__
/** \return the full-pivoting Householder QR decomposition of \c *this. /** \return the full-pivoting Householder QR decomposition of \c *this.
* *
* \sa class FullPivHouseholderQR * \sa class FullPivHouseholderQR
@ -671,7 +670,6 @@ MatrixBase<Derived>::fullPivHouseholderQr() const
{ {
return FullPivHouseholderQR<PlainObject>(eval()); return FullPivHouseholderQR<PlainObject>(eval());
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/QR/HouseholderQR.h
View File

@ -393,7 +393,6 @@ void HouseholderQR<MatrixType>::computeInPlace()
m_isInitialized = true; m_isInitialized = true;
} }
#ifndef __CUDACC__
/** \return the Householder QR decomposition of \c *this. /** \return the Householder QR decomposition of \c *this.
* *
* \sa class HouseholderQR * \sa class HouseholderQR
@ -404,7 +403,6 @@ MatrixBase<Derived>::householderQr() const
{ {
return HouseholderQR<PlainObject>(eval()); return HouseholderQR<PlainObject>(eval());
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

2
Eigen/src/SVD/JacobiSVD.h
View File

@ -783,7 +783,6 @@ JacobiSVD<MatrixType, QRPreconditioner>::compute(const MatrixType& matrix, unsig
return *this; return *this;
} }
#ifndef __CUDACC__
/** \svd_module /** \svd_module
* *
* \return the singular value decomposition of \c *this computed by two-sided * \return the singular value decomposition of \c *this computed by two-sided
@ -797,7 +796,6 @@ MatrixBase<Derived>::jacobiSvd(unsigned int computationOptions) const
{ {
return JacobiSVD<PlainObject>(*this, computationOptions); return JacobiSVD<PlainObject>(*this, computationOptions);
} }
#endif // __CUDACC__
} // end namespace Eigen } // end namespace Eigen

3
test/cuda_basic.cu
View File

@ -26,7 +26,8 @@
#include "main.h" #include "main.h"
#include "cuda_common.h" #include "cuda_common.h"
#include <Eigen/Eigenvalues> // Check that dense modules can be properly parsed by nvcc
#include <Eigen/Dense>
// struct Foo{ // struct Foo{
// EIGEN_DEVICE_FUNC // EIGEN_DEVICE_FUNC