GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-30 07:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Missing EIGEN_DEVICE_FUNCs to get gpu_basic passing with CUDA 9.

Browse Source 
CUDA 9 seems to require labelling defaulted constructors as
`EIGEN_DEVICE_FUNC`, despite giving warnings that such labels are
ignored.  Without these labels, the `gpu_basic` test fails to
compile, with errors about calling `__host__` functions from
`__host__ __device__` functions.
This commit is contained in:
Antonio Sanchez 2021-08-31 08:32:21 -07:00
parent 74da2e6821
commit 998bab4b04
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Core/Block.h
View File

@ -260,19 +260,19 @@ template<typename XprType, int BlockRows, int BlockCols, bool InnerPanel, bool H
} }
template<int LoadMode> template<int LoadMode>
inline PacketScalar packet(Index rowId, Index colId) const EIGEN_DEVICE_FUNC inline PacketScalar packet(Index rowId, Index colId) const
{ {
return m_xpr.template packet<Unaligned>(rowId + m_startRow.value(), colId + m_startCol.value()); return m_xpr.template packet<Unaligned>(rowId + m_startRow.value(), colId + m_startCol.value());
} }
template<int LoadMode> template<int LoadMode>
inline void writePacket(Index rowId, Index colId, const PacketScalar& val) EIGEN_DEVICE_FUNC inline void writePacket(Index rowId, Index colId, const PacketScalar& val)
{ {
m_xpr.template writePacket<Unaligned>(rowId + m_startRow.value(), colId + m_startCol.value(), val); m_xpr.template writePacket<Unaligned>(rowId + m_startRow.value(), colId + m_startCol.value(), val);
} }
template<int LoadMode> template<int LoadMode>
inline PacketScalar packet(Index index) const EIGEN_DEVICE_FUNC inline PacketScalar packet(Index index) const
{ {
return m_xpr.template packet<Unaligned> return m_xpr.template packet<Unaligned>
(m_startRow.value() + (RowsAtCompileTime == 1 ? 0 : index), (m_startRow.value() + (RowsAtCompileTime == 1 ? 0 : index),
@ -280,7 +280,7 @@ template<typename XprType, int BlockRows, int BlockCols, bool InnerPanel, bool H
} }
template<int LoadMode> template<int LoadMode>
inline void writePacket(Index index, const PacketScalar& val) EIGEN_DEVICE_FUNC inline void writePacket(Index index, const PacketScalar& val)
{ {
m_xpr.template writePacket<Unaligned> m_xpr.template writePacket<Unaligned>
(m_startRow.value() + (RowsAtCompileTime == 1 ? 0 : index), (m_startRow.value() + (RowsAtCompileTime == 1 ? 0 : index),

10
Eigen/src/Core/util/Macros.h
View File

@ -1225,7 +1225,7 @@ namespace Eigen {
* This is necessary, because the implicit definition is deprecated if the copy-assignment is overridden. * This is necessary, because the implicit definition is deprecated if the copy-assignment is overridden.
*/ */
#if EIGEN_HAS_CXX11 #if EIGEN_HAS_CXX11
#define EIGEN_DEFAULT_COPY_CONSTRUCTOR(CLASS) CLASS(const CLASS&) = default; #define EIGEN_DEFAULT_COPY_CONSTRUCTOR(CLASS) EIGEN_DEVICE_FUNC CLASS(const CLASS&) = default;
#else #else
#define EIGEN_DEFAULT_COPY_CONSTRUCTOR(CLASS) #define EIGEN_DEFAULT_COPY_CONSTRUCTOR(CLASS)
#endif #endif
@ -1250,12 +1250,12 @@ namespace Eigen {
*/ */
#if EIGEN_HAS_CXX11 #if EIGEN_HAS_CXX11
#define EIGEN_DEFAULT_EMPTY_CONSTRUCTOR_AND_DESTRUCTOR(Derived) \ #define EIGEN_DEFAULT_EMPTY_CONSTRUCTOR_AND_DESTRUCTOR(Derived) \
Derived() = default; \ EIGEN_DEVICE_FUNC Derived() = default; \
~Derived() = default; EIGEN_DEVICE_FUNC ~Derived() = default;
#else #else
#define EIGEN_DEFAULT_EMPTY_CONSTRUCTOR_AND_DESTRUCTOR(Derived) \ #define EIGEN_DEFAULT_EMPTY_CONSTRUCTOR_AND_DESTRUCTOR(Derived) \
Derived() {}; \ EIGEN_DEVICE_FUNC Derived() {}; \
/* ~Derived() {}; */ /* EIGEN_DEVICE_FUNC ~Derived() {}; */
#endif #endif