From 8d16b43e79c9974abf2820ecee9efd5ebe775fe5 Mon Sep 17 00:00:00 2001
From: Aryan Salmanpour <aryan.salmanpour@amd.com>
Date: Thu, 9 Dec 2021 14:15:50 -0500
Subject: [PATCH] MIvisionX HIP GPU backend - use __HIP_PLATFORM_AMD__ instead
 of __HIP_PLATFORM_HCC__ which is deprecated (#703)

---
 amd_openvx/openvx/ago/ago_platform.h               | 4 ++--
 amd_openvx/openvx/hipvx/CMakeLists.txt             | 2 +-
 amd_openvx_extensions/amd_nn/CMakeLists.txt        | 2 +-
 amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt | 2 +-
 amd_openvx_extensions/amd_rpp/CMakeLists.txt       | 2 +-
 rocAL/rocAL/CMakeLists.txt                         | 2 +-
 rocAL/rocAL/rocAL_hip/CMakeLists.txt               | 2 +-
 utilities/runvx/vxUtils.h                          | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/amd_openvx/openvx/ago/ago_platform.h b/amd_openvx/openvx/ago/ago_platform.h
index 21746d90aa..e90571999e 100644
--- a/amd_openvx/openvx/ago/ago_platform.h
+++ b/amd_openvx/openvx/ago/ago_platform.h
@@ -78,8 +78,8 @@ using namespace std;
 #endif
 
 #if ENABLE_HIP
-#ifndef __HIP_PLATFORM_HCC__
-#define __HIP_PLATFORM_HCC__
+#ifndef __HIP_PLATFORM_AMD__
+#define __HIP_PLATFORM_AMD__
 #endif
 #define HIPRTC_GET_TYPE_NAME
 #include "hip/hip_runtime_api.h"
diff --git a/amd_openvx/openvx/hipvx/CMakeLists.txt b/amd_openvx/openvx/hipvx/CMakeLists.txt
index 2d709c084f..41ad618597 100644
--- a/amd_openvx/openvx/hipvx/CMakeLists.txt
+++ b/amd_openvx/openvx/hipvx/CMakeLists.txt
@@ -38,6 +38,6 @@ set(HIPVX_SOURCES
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_CXX_FLAGS}")
     add_library(openvx_hip OBJECT ${HIPVX_SOURCES})
     set_target_properties(openvx_hip PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_compile_definitions(openvx_hip PRIVATE __HIP_PLATFORM_HCC__)
+    target_compile_definitions(openvx_hip PRIVATE __HIP_PLATFORM_AMD__)
 
 
diff --git a/amd_openvx_extensions/amd_nn/CMakeLists.txt b/amd_openvx_extensions/amd_nn/CMakeLists.txt
index 7fa630b6ed..0223cf31ac 100644
--- a/amd_openvx_extensions/amd_nn/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_nn/CMakeLists.txt
@@ -118,7 +118,7 @@ elseif (GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP" AND HIP_FOUND)
     message("-- ${Green}amd_nn -- Building with HIP${ColourReset}")
     set(ENABLE_OPENCL 0)
     set(ENABLE_HIP 1)
-    add_definitions(-DENABLE_OPENCL=${ENABLE_OPENCL} -DENABLE_HIP=${ENABLE_HIP} -D__HIP_PLATFORM_HCC__)
+    add_definitions(-DENABLE_OPENCL=${ENABLE_OPENCL} -DENABLE_HIP=${ENABLE_HIP} -D__HIP_PLATFORM_AMD__)
     include_directories(${HIP_PATH}/include  ${HSA_PATH}/include)
     link_directories(${HIP_PATH}/lib)
     add_subdirectory(nn_hip)
diff --git a/amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt b/amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt
index 09315d3e40..52031b0752 100644
--- a/amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt
@@ -34,4 +34,4 @@ set(NN_HIP_SOURCES
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_CXX_FLAGS}")
     add_library(nn_hip OBJECT ${NN_HIP_SOURCES})
     set_target_properties(nn_hip PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_compile_definitions(nn_hip PRIVATE __HIP_PLATFORM_HCC__)
+    target_compile_definitions(nn_hip PRIVATE __HIP_PLATFORM_AMD__)
diff --git a/amd_openvx_extensions/amd_rpp/CMakeLists.txt b/amd_openvx_extensions/amd_rpp/CMakeLists.txt
index 4db100f6a7..b7701057a9 100644
--- a/amd_openvx_extensions/amd_rpp/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_rpp/CMakeLists.txt
@@ -147,7 +147,7 @@ elseif (GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP" AND HIP_FOUND)
     message("-- ${Green}amd_rpp -- Building with HIP${ColourReset}")
     set(ENABLE_OPENCL 0)
     set(ENABLE_HIP 1)
-    add_definitions(-DENABLE_OPENCL=${ENABLE_OPENCL} -DENABLE_HIP=${ENABLE_HIP} -DRPP_BACKEND_HIP=1 -D__HIP_PLATFORM_HCC__)
+    add_definitions(-DENABLE_OPENCL=${ENABLE_OPENCL} -DENABLE_HIP=${ENABLE_HIP} -DRPP_BACKEND_HIP=1 -D__HIP_PLATFORM_AMD__)
     include_directories(${HIP_PATH}/include  ${HSA_PATH}/include)
     link_directories(${HIP_PATH}/lib)
     add_library(vx_rpp SHARED ${SOURCES})
diff --git a/rocAL/rocAL/CMakeLists.txt b/rocAL/rocAL/CMakeLists.txt
index 2be697407c..98e1136e5d 100644
--- a/rocAL/rocAL/CMakeLists.txt
+++ b/rocAL/rocAL/CMakeLists.txt
@@ -193,7 +193,7 @@ if(${BUILD_RALI})
 
     if("${BACKEND}" STREQUAL "HIP" AND HIP_FOUND)
         include_directories(${HIP_PATH}/include ${HSA_PATH}/include rocAL_hip)
-        target_compile_definitions(${PROJECT_NAME} PRIVATE __HIP_PLATFORM_HCC__)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE __HIP_PLATFORM_AMD__)
         target_compile_definitions(${PROJECT_NAME} PUBLIC ENABLE_HIP=1)
     else()
         include_directories(${OpenCL_INCLUDE_DIRS} ${OpenCL_INCLUDE_DIRS}/Headers)
diff --git a/rocAL/rocAL/rocAL_hip/CMakeLists.txt b/rocAL/rocAL/rocAL_hip/CMakeLists.txt
index 46e2e486f9..45c9e8eaed 100644
--- a/rocAL/rocAL/rocAL_hip/CMakeLists.txt
+++ b/rocAL/rocAL/rocAL_hip/CMakeLists.txt
@@ -32,4 +32,4 @@ set(CMAKE_CXX_COMPILER ${COMPILER_FOR_HIP})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_CXX_FLAGS}")
 add_library(${PROJECT_NAME} OBJECT ${rocAL_HIP_SOURCES})
 set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_compile_definitions(${PROJECT_NAME} PRIVATE __HIP_PLATFORM_HCC__)
\ No newline at end of file
+target_compile_definitions(${PROJECT_NAME} PRIVATE __HIP_PLATFORM_AMD__)
\ No newline at end of file
diff --git a/utilities/runvx/vxUtils.h b/utilities/runvx/vxUtils.h
index ed90c2d1ec..d5d725f467 100644
--- a/utilities/runvx/vxUtils.h
+++ b/utilities/runvx/vxUtils.h
@@ -78,7 +78,7 @@ THE SOFTWARE.
 #endif
 
 #if ENABLE_HIP
-#define __HIP_PLATFORM_HCC__
+#define __HIP_PLATFORM_AMD__
 #include "hip/hip_runtime.h"
 #include "hip/hip_runtime_api.h"
 #endif