From 1881f7fe8a2ac00f0628029d1820f54cabd6c449 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 [ROCm/clr commit: 3a83b3a62cd3ae05554db7cdd2fb7ed173aeb5bf] --- .../clr/hipamd/include/hip/hcc_detail/library_types.h | 11 +++++------ .../hipamd/include/hip/nvcc_detail/hip_runtime_api.h | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/library_types.h b/projects/clr/hipamd/include/hip/hcc_detail/library_types.h index 74bae81321..6fcd0dc3d1 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/library_types.h +++ b/projects/clr/hipamd/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/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h index 02f83b329e..3d17f1d867 100644 --- a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h +++ b/projects/clr/hipamd/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 caba615304e88daf2e48e621d45392c7e380e427 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 [ROCm/clr commit: 7a1301eab95cbb38016b1c09fa3549a1bf42d1b2] --- projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h index 3d17f1d867..5684596e13 100644 --- a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h +++ b/projects/clr/hipamd/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