[ABI Break] Remove 'memoryType' from hipPointerAttribute_t

pruthvistony · jeffdaily · commit c77ddb80b63a · 2023-11-17T15:44:14.000Z
- SWDEV-425146
diff --git a/aten/src/ATen/cuda/detail/CUDAHooks.cpp b/aten/src/ATen/cuda/detail/CUDAHooks.cpp
@@ -151,10 +151,10 @@ bool CUDAHooks::isPinnedPtr(const void* data) const {
     return false;
   }
 #endif
-#if !defined(USE_ROCM)
-  return attr.type == cudaMemoryTypeHost;
-#else
+#if defined(USE_ROCM) && ROCM_VERSION < 60000
   return attr.memoryType == cudaMemoryTypeHost;
+#else
+  return attr.type == cudaMemoryTypeHost;
 #endif
 }
 
diff --git a/caffe2/core/common_gpu.h b/caffe2/core/common_gpu.h
@@ -86,10 +86,10 @@ namespace caffe2 {
 class TensorCoreEngine {};
 #endif // USE_ROCM
 
-#if !defined(USE_ROCM)
-#define CAFFE2_CUDA_PTRATTR_MEMTYPE type
-#else
+#if defined(USE_ROCM) && ROCM_VERSION < 60000
 #define CAFFE2_CUDA_PTRATTR_MEMTYPE memoryType
+#else
+#define CAFFE2_CUDA_PTRATTR_MEMTYPE type
 #endif
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,10 @@ bool CUDAHooks::isPinnedPtr(const void* data) const {`
`151`	`151`	`return false;`
`152`	`152`	`}`
`153`	`153`	`#endif`
`154`		`-#if !defined(USE_ROCM)`
`155`		`- return attr.type == cudaMemoryTypeHost;`
`156`		`-#else`
	`154`	`+#if defined(USE_ROCM) && ROCM_VERSION < 60000`
`157`	`155`	`return attr.memoryType == cudaMemoryTypeHost;`
	`156`	`+#else`
	`157`	`+ return attr.type == cudaMemoryTypeHost;`
`158`	`158`	`#endif`
`159`	`159`	`}`
`160`	`160`