From 337b7ce06a120aa2140bc0479f9693c7162693aa Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Fri, 11 Oct 2019 15:18:08 +0300 Subject: [PATCH 1/2] [HIP][fix] Prefix libraryPropertyType to fix build of rocFFT and TensorFlow --- include/hip/hcc_detail/library_types.h | 11 +++++------ include/hip/nvcc_detail/hip_runtime_api.h | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/hip/hcc_detail/library_types.h b/include/hip/hcc_detail/library_types.h index 74bae81321..6fcd0dc3d1 100644 --- a/include/hip/hcc_detail/library_types.h +++ b/include/hip/hcc_detail/library_types.h @@ -32,11 +32,10 @@ typedef enum hipDataType { HIP_C_64F = 5 } hipDataType; -typedef enum libraryPropertyType { - MAJOR_VERSION, - MINOR_VERSION, - PATCH_LEVEL -} libraryPropertyType; +typedef enum hipLibraryPropertyType { + HIP_LIBRARY_MAJOR_VERSION, + HIP_LIBRARY_MINOR_VERSION, + HIP_LIBRARY_PATCH_LEVEL +} hipLibraryPropertyType; #endif - diff --git a/include/hip/nvcc_detail/hip_runtime_api.h b/include/hip/nvcc_detail/hip_runtime_api.h index 02f83b329e..3d17f1d867 100644 --- a/include/hip/nvcc_detail/hip_runtime_api.h +++ b/include/hip/nvcc_detail/hip_runtime_api.h @@ -59,6 +59,12 @@ typedef enum hipMemcpyKind { #define HIP_C_32F CUDA_C_32F #define HIP_C_64F CUDA_C_64F +// hipDataType +#define hipLibraryPropertyType libraryPropertyType +#define HIP_LIBRARY_MAJOR_VERSION MAJOR_VERSION +#define HIP_LIBRARY_MINOR_VERSION MINOR_VERSION +#define HIP_LIBRARY_PATCH_LEVEL PATCH_LEVEL + // hipTextureAddressMode #define hipTextureAddressMode cudaTextureAddressMode #define hipAddressModeWrap cudaAddressModeWrap From 28c23a7b1a70da536c5b0f08e5aa5a49a5a38bc5 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Fri, 11 Oct 2019 15:20:58 +0300 Subject: [PATCH 2/2] [HIP] Fix typo in a comment --- include/hip/nvcc_detail/hip_runtime_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hip/nvcc_detail/hip_runtime_api.h b/include/hip/nvcc_detail/hip_runtime_api.h index 3d17f1d867..5684596e13 100644 --- a/include/hip/nvcc_detail/hip_runtime_api.h +++ b/include/hip/nvcc_detail/hip_runtime_api.h @@ -59,7 +59,7 @@ typedef enum hipMemcpyKind { #define HIP_C_32F CUDA_C_32F #define HIP_C_64F CUDA_C_64F -// hipDataType +// hipLibraryPropertyType #define hipLibraryPropertyType libraryPropertyType #define HIP_LIBRARY_MAJOR_VERSION MAJOR_VERSION #define HIP_LIBRARY_MINOR_VERSION MINOR_VERSION