Skip to content

Updating to new Tensile cmake #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saadrahim merged 6 commits into from
Aug 20, 2019
Merged

Updating to new Tensile cmake #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2f6a98
Updating to new Tensile cmake
saadrahim Aug 20, 2019
d42a2b3
Setting to develop
saadrahim Aug 20, 2019
d0ce222
Fixing whitespace
saadrahim Aug 20, 2019
fd95e24
Fixing unnecessary line
saadrahim Aug 20, 2019
522cb03
Removing commented out lines
saadrahim Aug 20, 2019
0f1c740
Updating to latest Tensile tag
saadrahim Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,18 @@ if( BUILD_WITH_TENSILE )
set_property( CACHE Tensile_COMPILER PROPERTY STRINGS hcc hipcc)

include(virtualenv)

if (Tensile_TEST_LOCAL_PATH)
virtualenv_install(${Tensile_TEST_LOCAL_PATH})
message (STATUS "using local Tensile from ${Tensile_TEST_LOCAL_PATH}, copied to ${Tensile_ROOT}")
else()
# Use the virtual-env setup and download package from specified repot:
set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" )
set( tensile_tag a472399c5e97ac13b171092c2eb61d87d3a08d53 CACHE STRING "Tensile tag to download" )
set( tensile_tag 8d594c27375a36d2f6eb4db39086ba6248440bf5 CACHE STRING "Tensile tag to download" )
virtualenv_install("git+https://github.com/${tensile_fork}/Tensile.git@${tensile_tag}")
message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}")
endif()
list(APPEND CMAKE_PREFIX_PATH ${VIRTUALENV_HOME_DIR})
set( Tensile_ROOT "${VIRTUALENV_HOME_DIR}/bin" CACHE STRING "Local path of Tensile" )
set( Tensile_TensileConfig ${VIRTUALENV_HOME_DIR}/cmake/TensileConfig.cmake)

find_package(Tensile REQUIRED)
endif()

# Find HCC/HIP dependencies
Expand Down
9 changes: 1 addition & 8 deletions library/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ if( BUILD_WITH_TENSILE )
list( APPEND package_targets Tensile )
endif( )

# HACK: We include the config file directly because find_package(Tensile) is broken
#include( ${Tensile_TensileConfig} )
execute_process(COMMAND "${VIRTUALENV_HOME_DIR}/bin/TensileGetPath" OUTPUT_VARIABLE INSTALLED_TENSILE_PATH)
message(STATUS "TENSILE_PATH: ${INSTALLED_TENSILE_PATH}")
find_package(Tensile 4.11.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")

set( Tensile_RUNTIME_LANGUAGE "HIP" )
message( STATUS "AMDGPU_TARGETS=${AMDGPU_TARGETS}" )
TensileCreateLibraryCmake(
Expand All @@ -52,8 +46,7 @@ if( BUILD_WITH_TENSILE )
${Tensile_MERGE_FILES}
${Tensile_SHORT_FILENAMES}
${Tensile_PRINT_DEBUG}
Tensile_ROOT ${Tensile_ROOT}
)
)

# Create a unique name for Tensile compiled for rocBLAS
set_target_properties( Tensile PROPERTIES OUTPUT_NAME tensile-rocblas CXX_EXTENSIONS NO )
Expand Down