From d194d0b42d73a1d9fc6a83e6cf9d6e25f2d8f881 Mon Sep 17 00:00:00 2001 From: Maximiliano Puccio Date: Wed, 20 May 2026 19:10:07 +0200 Subject: [PATCH] GPU: avoid redefinition of vector types if HIP already did it --- GPU/Common/GPUCommonDefAPI.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/Common/GPUCommonDefAPI.h b/GPU/Common/GPUCommonDefAPI.h index 4d4e04f10b2fa..af78b98315ade 100644 --- a/GPU/Common/GPUCommonDefAPI.h +++ b/GPU/Common/GPUCommonDefAPI.h @@ -58,7 +58,7 @@ #define GPUconstantref() // reference / ptr to constant memory #define GPUconstexprref() // reference / ptr to variable declared as GPUconstexpr() - #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 + #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 struct float4 { float x, y, z, w; }; struct float3 { float x, y, z; }; struct float2 { float x; float y; };