Skip to content

Commit d194d0b

Browse files
authored
GPU: avoid redefinition of vector types if HIP already did it
1 parent f8f5d1e commit d194d0b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

GPU/Common/GPUCommonDefAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#define GPUconstantref() // reference / ptr to constant memory
5959
#define GPUconstexprref() // reference / ptr to variable declared as GPUconstexpr()
6060

61-
#ifndef __VECTOR_TYPES_H__ // FIXME: ROOT will pull in these CUDA definitions if built against CUDA, so we have to add an ugly protection here
61+
#if !defined(__VECTOR_TYPES_H__) && !defined(HIP_INCLUDE_HIP_HIP_VECTOR_TYPES_H) // FIXME: ROOT will pull in these CUDA definitions if built against CUDA, so we have to add an ugly protection here
6262
struct float4 { float x, y, z, w; };
6363
struct float3 { float x, y, z; };
6464
struct float2 { float x; float y; };

0 commit comments

Comments
 (0)