Skip to content

Deprecate AMDGPU_TARGETS variable #1770

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

Open
lawruble13 wants to merge 5 commits into
base: release-staging/rocm-rel-6.5
Choose a base branch
from
Open

Deprecate AMDGPU_TARGETS variable #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0370195
Use GPU_TARGETS for Tensile instead of AMDGPU_TARGETS
lawruble13 Oct 29, 2024
0f31d3b
remove settings
lawruble13 Oct 29, 2024
64613ed
Add deprecation message for AMDGPU_TARGETS
lawruble13 Jan 16, 2025
cc4a59c
Update AMDGPU_TARGETS in Verbose.cmake
lawruble13 Mar 13, 2025
d0e0c1e
Update AMDGPU_TARGETS in install.sh
lawruble13 Mar 13, 2025
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
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ else()
)
endif()

if(AMDGPU_TARGETS AND NOT GPU_TARGETS)
message( DEPRECATION "AMDGPU_TARGETS use is deprecated. Use GPU_TARGETS." )
endif()

if (AMDGPU_TARGETS)
set(TMPAMDGPU_TARGETS "${AMDGPU_TARGETS}")
if(TMPAMDGPU_TARGETS STREQUAL "all" )
Expand All @@ -180,8 +184,10 @@ else()
else()
set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target")
endif()
# Don't force, the user should be allowed to override this if desired
set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "List of specific machine times for library to target")

message(STATUS "AMDGPU_TARGETS: ${AMDGPU_TARGETS}")
message(STATUS "GPU_TARGETS: ${GPU_TARGETS}")

if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
find_package( hip REQUIRED CONFIG PATHS ${HIP_DIR} ${ROCM_PATH} /opt/rocm )
Expand All @@ -191,7 +197,7 @@ else()

if( BUILD_WITH_TENSILE )
# we will have expanded "all" for tensile to ensure consistency as we have local rules
set( Tensile_ARCHITECTURE "${AMDGPU_TARGETS}" CACHE STRING "Tensile to use which architecture?" FORCE)
set( Tensile_ARCHITECTURE "${GPU_TARGETS}" CACHE STRING "Tensile to use which architecture?" FORCE)

set( Tensile_LOGIC "asm_full" CACHE STRING "Tensile to use which logic?")
set( Tensile_CODE_OBJECT_VERSION "default" CACHE STRING "Tensile code_object_version")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Verbose.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS : ${CMAKE_SHARED_LINKER_F
message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_DEBUG : ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_RELEASE : ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
message(STATUS "==============" )
message(STATUS "\t==>AMDGPU_TARGETS : ${AMDGPU_TARGETS}")
message(STATUS "\t==GPU_TARGETS : ${GPU_TARGETS}")
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ pushd .
# #################################################
# configure & build
# #################################################
cmake_common_options="-DAMDGPU_TARGETS=${gpu_architecture}"
cmake_common_options="-DGPU_TARGETS=${gpu_architecture}"
cmake_client_options=""

if [[ "${legacy_hipblas_direct}" == true ]]; then
Expand Down