From ee4473f5884ebb12616753ddf7535e4f8a06fb92 Mon Sep 17 00:00:00 2001 From: Laurent Morichetti Date: Fri, 2 Mar 2018 06:51:51 -0800 Subject: [PATCH] __CUDA__ and __HIP__ are both defined when compiling with 'clang -x hip', so make sure __HIP__ is not defined in the case of __HIP_PLATFORM_NVCC__. [ROCm/clr commit: 49f819ab9e133fe8aa63d9951456a7c5178179f5] --- projects/clr/hipamd/include/hip/hip_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/include/hip/hip_common.h b/projects/clr/hipamd/include/hip/hip_common.h index fafac1d9ba..d884a23c5f 100644 --- a/projects/clr/hipamd/include/hip/hip_common.h +++ b/projects/clr/hipamd/include/hip/hip_common.h @@ -31,7 +31,7 @@ THE SOFTWARE. #endif //__HCC__ // Auto enable __HIP_PLATFORM_NVCC__ if compiling with NVCC -#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDA__)) +#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDA__) && !defined(__HIP__)) #define __HIP_PLATFORM_NVCC__ #ifdef __CUDACC__ #define __HIPCC__