From ff8d9d3c77be527352b07cf37316c38ad17d9429 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Thu, 4 Aug 2022 17:27:12 +0530 Subject: [PATCH] SWDEV-348820 - Fix hipPointerAttribute_t incompatibility - Use hipPointerAttribute_t.type instead of hipPointerAttribute_t.memoryType Change-Id: I3bf1c0758bdae987213ba7de62247dd420ef4cc9 [ROCm/clr commit: cbc3a0a65218c3e43121fc66230184c5844d9fe7] --- .../include/hip/nvidia_detail/nvidia_hip_runtime_api.h | 6 +++--- projects/clr/hipamd/src/hip_memory.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index cd43a6265a..43de20a8ff 100644 --- a/projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -2227,13 +2227,13 @@ inline static hipError_t hipPointerGetAttributes(hipPointerAttribute_t* attribut #endif switch (memType) { case cudaMemoryTypeDevice: - attributes->memoryType = hipMemoryTypeDevice; + attributes->type = hipMemoryTypeDevice; break; case cudaMemoryTypeHost: - attributes->memoryType = hipMemoryTypeHost; + attributes->type = hipMemoryTypeHost; break; case cudaMemoryTypeManaged: - attributes->memoryType = hipMemoryTypeManaged; + attributes->type = hipMemoryTypeManaged; break; default: return hipErrorInvalidValue; diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp index 8d9bf1c5ad..823aeec619 100644 --- a/projects/clr/hipamd/src/hip_memory.cpp +++ b/projects/clr/hipamd/src/hip_memory.cpp @@ -3003,9 +3003,9 @@ hipError_t hipPointerGetAttributes(hipPointerAttribute_t* attributes, const void memset(attributes, 0, sizeof(hipPointerAttribute_t)); if (memObj != nullptr) { - attributes->memoryType = ((CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_USE_HOST_PTR) & + attributes->type = ((CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_USE_HOST_PTR) & memObj->getMemFlags())? hipMemoryTypeHost : hipMemoryTypeDevice; - if (attributes->memoryType == hipMemoryTypeHost) { + if (attributes->type == hipMemoryTypeHost) { if (memObj->getHostMem() != nullptr) { attributes->hostPointer = static_cast(memObj->getHostMem()) + offset; }