From df0de2458f92f0d658789965be45d23a3a5e22de Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Mon, 9 Oct 2023 07:20:51 -0400 Subject: [PATCH] SWDEV-425460, SWDEV-426132, SWDEV-426133, SWDEV-426137 - Revert "SWDEV-399623 - [ABI Break] Remove 'memoryType' from hipPointerAttribute_t" This reverts commit 24ad87502df904db1180c2f933513927c515294d. Reason for revert: This causes build failure in AMG, UCC & UCX Change-Id: I9198de12f04fa1790cfbd8b65955723e05700c8a [ROCm/hip commit: 8ed05a156733ae7b997038c38fe7b8437e0a2679] --- projects/hip/include/hip/hip_runtime_api.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/hip/include/hip/hip_runtime_api.h b/projects/hip/include/hip/hip_runtime_api.h index d43526bf37..b63ffda448 100644 --- a/projects/hip/include/hip/hip_runtime_api.h +++ b/projects/hip/include/hip/hip_runtime_api.h @@ -186,7 +186,11 @@ typedef enum hipMemoryType { * Pointer attributes */ typedef struct hipPointerAttribute_t { - enum hipMemoryType type; + union { + // Deprecated, use instead type + enum hipMemoryType memoryType; + enum hipMemoryType type; + }; int device; void* devicePointer; void* hostPointer;