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

Fix for ROCm/HIP breakage - 201013

Browse Source 
The following commit seems to have introduced regressions in ROCm/HIP support.

183a208212

It causes some unit-tests to fail with the following error

```
...
Eigen/src/Core/GenericPacketMath.h:322:3: error: no member named 'bit_and' in the global namespace; did you mean 'std::bit_and'?
...
Eigen/src/Core/GenericPacketMath.h:329:3: error: no member named 'bit_or' in the global namespace; did you mean 'std::bit_or'?
...
Eigen/src/Core/GenericPacketMath.h:336:3: error: no member named 'bit_xor' in the global namespace; did you mean 'std::bit_xor'?
...
```

The error occurs because, when compiling the device code in HIP/CUDA, the compiler will pick up the some of the std functions (whose calls are prefixed by EIGEN_USING_STD) from the global namespace (i.e. use ::bit_xor instead of std::bit_xor). For this to work, those functions must be declared in the global namespace in the HIP/CUDA header files. The `bit_and`, `bit_or` and `bit_xor` routines are not declared in the HIP header file that contain the decls for the std math functions ( `math_functions.h` ), and this is the cause of the error above.

It seems that the newer HIP compilers do support the calling of `std::` math routines within device code, and the ideal fix here would have been to change all calls to std math functions in EIGEN to use the `std::` namespace (instead of the global namespace ), when compiling  with HIP compiler. However it seems there was a recent commit to remove the EIGEN_USING_STD_MATH macro and collapse it uses into the EIGEN_USING_STD macro ( 4091f6b25c ).

Replacing all std math calls will essentially require re-surrecting the EIGEN_USING_STD_MATH macro, so not choosing that option.

Also HIP compilers only have support std math calls within device code, and not all std functions (specifically not for malloc/free which are prefixed via EIGEN_USING_STD). So modyfing EIGEN_USE_STD implementation to use std:: namspace for HIP will not work either.

Hence going for the ugly solution of special casing the three calls that breaking the HIP compile, to explicitly use the std:: namespace
This commit is contained in:
Deven Desai 2020-10-14 00:53:20 +00:00
parent 6ea8091705
commit 011e0db31d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Eigen/src/Core/GenericPacketMath.h
View File

@ -270,22 +270,34 @@ EIGEN_DEVICE_FUNC inline Packet bitwise_helper(const Packet& a, const Packet& b,
/** \internal \returns the bitwise and of \a a and \a b */ /** \internal \returns the bitwise and of \a a and \a b */
template<typename Packet> EIGEN_DEVICE_FUNC inline Packet template<typename Packet> EIGEN_DEVICE_FUNC inline Packet
pand(const Packet& a, const Packet& b) { pand(const Packet& a, const Packet& b) {
#if defined(EIGEN_HIP_DEVICE_COMPILE)
return bitwise_helper(a ,b, std::bit_and<unsigned char>());
#else
EIGEN_USING_STD(bit_and); EIGEN_USING_STD(bit_and);
return bitwise_helper(a ,b, bit_and<unsigned char>()); return bitwise_helper(a ,b, bit_and<unsigned char>());
#endif
} }
/** \internal \returns the bitwise or of \a a and \a b */ /** \internal \returns the bitwise or of \a a and \a b */
template<typename Packet> EIGEN_DEVICE_FUNC inline Packet template<typename Packet> EIGEN_DEVICE_FUNC inline Packet
por(const Packet& a, const Packet& b) { por(const Packet& a, const Packet& b) {
#if defined(EIGEN_HIP_DEVICE_COMPILE)
return bitwise_helper(a ,b, std::bit_or<unsigned char>());
#else
EIGEN_USING_STD(bit_or); EIGEN_USING_STD(bit_or);
return bitwise_helper(a ,b, bit_or<unsigned char>()); return bitwise_helper(a ,b, bit_or<unsigned char>());
#endif
} }
/** \internal \returns the bitwise xor of \a a and \a b */ /** \internal \returns the bitwise xor of \a a and \a b */
template<typename Packet> EIGEN_DEVICE_FUNC inline Packet template<typename Packet> EIGEN_DEVICE_FUNC inline Packet
pxor(const Packet& a, const Packet& b) { pxor(const Packet& a, const Packet& b) {
#if defined(EIGEN_HIP_DEVICE_COMPILE)
return bitwise_helper(a ,b, std::bit_xor<unsigned char>());
#else
EIGEN_USING_STD(bit_xor); EIGEN_USING_STD(bit_xor);
return bitwise_helper(a ,b, bit_xor<unsigned char>()); return bitwise_helper(a ,b, bit_xor<unsigned char>());
#endif
} }
/** \internal \returns the bitwise and of \a a and not \a b */ /** \internal \returns the bitwise and of \a a and not \a b */