devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent CUDA calling a __host__ function from a __host__ __device__ function is not allowed error.

Browse Source
This commit is contained in:
Christoph Hertzberg
2014-10-21 20:40:09 +02:00
parent a303b6a733
commit cf09c5f687
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/MathFunctions.h
View File

@@ -596,7 +596,7 @@ template<typename T>
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
inline T mini(const T& x, const T& y) inline T mini(const T& x, const T& y)
{ {
using std::min; EIGEN_USING_STD_MATH(min);
return min EIGEN_NOT_A_MACRO (x,y); return min EIGEN_NOT_A_MACRO (x,y);
} }
@@ -604,7 +604,7 @@ template<typename T>
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
inline T maxi(const T& x, const T& y) inline T maxi(const T& x, const T& y)
{ {
using std::max; EIGEN_USING_STD_MATH(max);
return max EIGEN_NOT_A_MACRO (x,y); return max EIGEN_NOT_A_MACRO (x,y);
} }