From e98b0db05cae1cd9bc11868588e7cbb19d27430b Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Thu, 14 Apr 2016 16:36:55 +0530 Subject: [PATCH 1/2] Change default HIP installation to /opt/rocm/hip [ROCm/clr commit: efe468bbabcd7a4f4ea66988ab536ee7562c71c5] --- projects/clr/hipamd/CMakeLists.txt | 2 +- projects/clr/hipamd/bin/hipcc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 124295fbf7..e7eee21b01 100644 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -64,7 +64,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CMAKE_INSTALL_PREFIX MATCHES if(CMAKE_BUILD_TYPE MATCHES Debug) set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Installation path for HIP" FORCE) elseif(CMAKE_BUILD_TYPE MATCHES Release) - set(CMAKE_INSTALL_PREFIX "/opt/hip" CACHE PATH "Installation path for HIP" FORCE) + set(CMAKE_INSTALL_PREFIX "/opt/rocm/hip" CACHE PATH "Installation path for HIP" FORCE) else() message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE specified. Valid values are Debug and Release") endif() diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc index ecf03e24ee..33bc1d9eca 100755 --- a/projects/clr/hipamd/bin/hipcc +++ b/projects/clr/hipamd/bin/hipcc @@ -196,7 +196,7 @@ if ($needHipHcc) { $HIP_USE_SHARED_LIBRARY = $ENV{'HIP_USE_SHARED_LIBRARY'}; $HIP_USE_SHARED_LIBRARY = 0 unless defined $HIP_USE_SHARED_LIBRARY; - #$HIPLDFLAGS .= " -L/opt/hip/lib -lhip_hcc" ; + #$HIPLDFLAGS .= " -L/opt/rocm/hip/lib -lhip_hcc" ; if ($HIP_USE_SHARED_LIBRARY) { $HIPLDFLAGS .= " -L$HIP_PATH/lib -Wl,--rpath=$HIP_PATH/lib -lhip_hcc"; } else { From 8ccfb15f7374e83de8a38563a89c0f7a2a6b190d Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Thu, 14 Apr 2016 16:37:27 +0530 Subject: [PATCH 2/2] Add hip soft-link to include for migrating to new include format [ROCm/clr commit: 0dfb9cddade0c5b7e92a82eaf96ce683810d77dc] --- projects/clr/hipamd/include/hip | 1 + 1 file changed, 1 insertion(+) create mode 120000 projects/clr/hipamd/include/hip diff --git a/projects/clr/hipamd/include/hip b/projects/clr/hipamd/include/hip new file mode 120000 index 0000000000..f5030fe889 --- /dev/null +++ b/projects/clr/hipamd/include/hip @@ -0,0 +1 @@ +../include \ No newline at end of file