From 0fa280877900006496a1af5fb5c2181407d6f30b Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Sun, 12 Jun 2022 23:43:29 -0700 Subject: [PATCH] SWDEV-295886 - Replaced hard coded path /opt/rocm with ROCM_PATH HIP cmake module path set to actual cmake file location Change-Id: I7a3e6eec2b51d0e550e68496eecf268a01a2d015 --- CMakeLists.txt | 9 +++++++-- run_test.sh | 2 +- test/CMakeLists.txt | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b77c58c2..67ec5d2c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ cmake_minimum_required(VERSION 3.18.0) project(ROCTRACER VERSION 4.1.0) +# set default ROCM_PATH +if(NOT DEFINED ROCM_PATH) + set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory") +endif() ## Set module name string(TOLOWER "${CMAKE_PROJECT_NAME}" ROCTRACER_NAME) @@ -37,10 +41,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) add_compile_options(-Wall -Werror) set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) -find_package(hsa-runtime64 REQUIRED CONFIG PATHS /opt/rocm/) -find_package(HIP REQUIRED CONFIG PATHS /opt/rocm/) +find_package(hsa-runtime64 REQUIRED CONFIG PATHS ${ROCM_PATH}) +find_package(HIP REQUIRED CONFIG PATHS ${ROCM_PATH}) if(NOT DEFINED LIBRARY_TYPE) set(LIBRARY_TYPE SHARED) diff --git a/run_test.sh b/run_test.sh index c13db62c64..9240c6e8c8 100755 --- a/run_test.sh +++ b/run_test.sh @@ -22,7 +22,7 @@ # IN THE SOFTWARE. ################################################################################ -ROCM_PATH="/opt/rocm" +ROCM_PATH="${ROCM_PATH:=/opt/rocm}" fatal() { echo "$1" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4665117fdc..7a123e07cc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,12 +25,12 @@ set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG}) set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP}) set(CMAKE_EXECUTABLE_RPATH_LINK_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG}) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/opt/rocm/hip/cmake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ROCM_PATH}/lib/cmake/hip") set(CMAKE_HIP_ARCHITECTURES OFF) find_package(HIP REQUIRED MODULE) find_package(Clang REQUIRED CONFIG - PATHS "/opt/rocm/" + PATHS "${ROCM_PATH}" PATH_SUFFIXES "llvm/lib/cmake/clang") ## Add a custom targets to build and run all the tests