From 2d1dc3949d128ec39886bb3fc693c99163609bfd Mon Sep 17 00:00:00 2001 From: Tao Sang Date: Tue, 12 Jan 2021 11:24:51 -0500 Subject: [PATCH] Workarround for rocThrust building failure Define the following for workarround of rocThrust building failure, HIP_INCLUDE_HIP_HCC_DETAIL_DRIVER_TYPES_H HIP_INCLUDE_HIP_HCC_DETAIL_HOST_DEFINES_H Change-Id: I1ae48677eafd749d6c25bca204c1724b026be22f [ROCm/hip commit: ef8110da2246947607a5e349e971be3e77469a56] --- projects/hip/include/hip/amd_detail/driver_types.h | 4 ++++ projects/hip/include/hip/amd_detail/host_defines.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/projects/hip/include/hip/amd_detail/driver_types.h b/projects/hip/include/hip/amd_detail/driver_types.h index 0f22ca333e..26a48cabc5 100644 --- a/projects/hip/include/hip/amd_detail/driver_types.h +++ b/projects/hip/include/hip/amd_detail/driver_types.h @@ -23,6 +23,10 @@ THE SOFTWARE. #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_DRIVER_TYPES_H #define HIP_INCLUDE_HIP_AMD_DETAIL_DRIVER_TYPES_H +// The follow macro should be removed after upstream updation. +// It's defined here for workarround of rocThrust building failure. +#define HIP_INCLUDE_HIP_HCC_DETAIL_DRIVER_TYPES_H + #ifndef __cplusplus #include #endif diff --git a/projects/hip/include/hip/amd_detail/host_defines.h b/projects/hip/include/hip/amd_detail/host_defines.h index d03a78aed1..7f1075acc1 100644 --- a/projects/hip/include/hip/amd_detail/host_defines.h +++ b/projects/hip/include/hip/amd_detail/host_defines.h @@ -28,6 +28,9 @@ THE SOFTWARE. #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_HOST_DEFINES_H #define HIP_INCLUDE_HIP_AMD_DETAIL_HOST_DEFINES_H +// The follow macro should be removed after upstream updation. +// It's defined here for workarround of rocThrust building failure. +#define HIP_INCLUDE_HIP_HCC_DETAIL_HOST_DEFINES_H // Add guard to Generic Grid Launch method #ifndef GENERIC_GRID_LAUNCH