Fix redefinition of half when using with hip-runtime-amd (AcademySoft…

…wareFoundation#426) Check for __HIP__ in addition to cuda (see AcademySoftwareFoundation#424) Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Sep 4, 2024 · a2ef565 · a2ef565
1 parent e32be5c
commit a2ef565
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Imath/half.h b/src/Imath/half.h
@@ -985,11 +985,13 @@ IMATH_EXPORT void printBits (std::ostream& os, float f);
 IMATH_EXPORT void printBits (char c[19], IMATH_INTERNAL_NAMESPACE::half h);
 IMATH_EXPORT void printBits (char c[35], float f);
 
-#    if !defined(__CUDACC__) && !defined(__CUDA_FP16_HPP__)
+#if !defined(__CUDACC__) && !defined(__CUDA_FP16_HPP__) && !defined(__HIP__)
 using half = IMATH_INTERNAL_NAMESPACE::half;
-#    else
-#        include <cuda_fp16.h>
-#    endif
+#elif defined(__CUDACC__) || defined(__CUDA_FP16_HPP__)
+#include <cuda_fp16.h>
+#elif defined(__HIP__)
+#include <hip/amd_detail/amd_hip_fp16.h>
+#endif
 
 #endif // __cplusplus