diff --git a/README.md b/README.md index 8f3e848113..e700ee403a 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,8 @@ rocTX API: - Set environment: export CMAKE_PREFIX_PATH=/opt/rocm - - To use custom HIP/HCC versions: + - To use custom HIP version: export HIP_PATH=/opt/rocm/hip - export HCC_HOME=/opt/rocm/hcc - To build roctracer library: export CMAKE_BUILD_TYPE= # release by default diff --git a/build.sh b/build.sh index cae5a59a28..a52012755c 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,6 @@ if [ -e "$DEFAULTS" ] ; then source "$DEFAULTS"; fi if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$SRC_DIR; fi if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi -if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi diff --git a/build_static.sh b/build_static.sh index 938df3ce99..bb6ecf29b6 100755 --- a/build_static.sh +++ b/build_static.sh @@ -17,7 +17,6 @@ if [ -e "$DEFAULTS" ] ; then source "$DEFAULTS"; fi if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$SRC_DIR; fi if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi -if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake index 8dbf2c9ccf..41f6253afc 100644 --- a/cmake_modules/env.cmake +++ b/cmake_modules/env.cmake @@ -89,7 +89,7 @@ else() set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1") endif() -## Enable HIP/HCC local build +## Enable HIP local build if ( DEFINED LOCAL_BUILD ) add_definitions ( -DLOCAL_BUILD=${LOCAL_BUILD} ) else() @@ -114,15 +114,10 @@ if ( NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH} ) endif() set ( ENV{CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ) -set ( HCC_HOME "/opt/rocm/hcc" ) set ( HIP_PATH "/opt/rocm/hip" ) -if ( DEFINED ENV{HCC_HOME} ) - set ( HCC_HOME $ENV{HCC_HOME} ) -endif() if ( DEFINED ENV{HIP_PATH} ) set ( HIP_PATH $ENV{HIP_PATH} ) endif() -set ( HCC_INC_DIR "${HCC_HOME}/include" ) set ( HIP_INC_DIR "${HIP_PATH}/include" ) ## Extend Compiler flags based on build type @@ -170,7 +165,6 @@ message ( "-----HSA-Runtime-Lib: ${HSA_RUNTIME_LIB_PATH}" ) message ( "----HSA_KMT_LIB_PATH: ${HSA_KMT_LIB_PATH}" ) message ( "-------ROCM_ROOT_DIR: ${ROCM_ROOT_DIR}" ) message ( "-------------KFD-Inc: ${HSA_KMT_INC_PATH}" ) -message ( "-------------HCC-Inc: ${HCC_INC_DIR}" ) message ( "-------------HIP-Inc: ${HIP_INC_DIR}" ) message ( "-------------HIP-VDI: ${HIP_VDI}" ) message ( "-----CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}" ) diff --git a/run_test.sh b/run_test.sh index c2ea74a6c5..61f1b3013b 100755 --- a/run_test.sh +++ b/run_test.sh @@ -7,7 +7,6 @@ fatal() { } if [ -z "$BUILD_DIR" ] ; then export BUILD_DIR=$PWD; fi -if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi cd $BUILD_DIR ./run.sh