Skip to content
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

Jump to bottom

Rename CMake package to ROCmCMakeBuildTools #128

Merged
merged 13 commits into from
Oct 11, 2023
Merged

Rename CMake package to ROCmCMakeBuildTools #128

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13fddbb
Initial work
lawruble13 May 11, 2023
7929877
Correct module path when testing
lawruble13 May 12, 2023
6001f53
Copyright info
lawruble13 Jun 8, 2023
bf12c2e
Tests use ROCmCMakeBuildTools
lawruble13 Jun 8, 2023
27fe29c
Update deprecation message and type
lawruble13 Jul 13, 2023
ff2f82b
Correct find_package redirect
lawruble13 Jul 13, 2023
2f02ee6
Update changelog
lawruble13 Jul 13, 2023
b41c6a6
Quote hinted path
lawruble13 Jul 13, 2023
bb2cbef
Change DEPRECATION to NOTICE
lawruble13 Aug 18, 2023
a1d5f70
Add test for the backwards compatibility alias
lawruble13 Aug 18, 2023
0aee51c
Update message to reflect not yet deprecated
lawruble13 Oct 6, 2023
28267dc
Merge branch 'release-staging/rocm-rel-6.0' into rename
lawruble13 Oct 6, 2023
6659970
Update message type
lawruble13 Oct 11, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Change Log for rocm-cmake

## [rocm-cmake 0.10.0 for ROCm 5.7.0]

### Changed
- Rename CMake package to ROCmCMakeBuildTools
- Deprecate use of ROCM package name, redirects to ROCmCMakeBuildTools for backwards compatibility
### Added
- Added ROCMTest module
- ROCMCreatePackage: Added support for ASAN packages
Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "")
project(rocm-cmake LANGUAGES NONE)

install(DIRECTORY share DESTINATION .)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ROCMConfigVersion.cmake DESTINATION share/rocm/cmake)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/ROCmCMakeBuildToolsConfigVersion.cmake
DESTINATION share/rocmcmakebuildtools/cmake
)

set(CPACK_RPM_PACKAGE_LICENSE "MIT")

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/share/rocm/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/share/rocmcmakebuildtools/cmake)
include(ROCMCreatePackage)
include(ROCMSetupVersion)

rocm_setup_version(VERSION 0.10.0)

include(CMakePackageConfigHelpers)
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ROCMConfigVersion.cmake
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ROCmCMakeBuildToolsConfigVersion.cmake
COMPATIBILITY SameMajorVersion)

rocm_create_package(
Expand All @@ -41,4 +44,3 @@ enable_testing()
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR})
add_subdirectory(test)
add_subdirectory(doc)

8 changes: 5 additions & 3 deletions share/rocm/cmake/ROCMConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# ######################################################################################################################
# Copyright (C) 2017 Advanced Micro Devices, Inc.
# Copyright (C) 2023 Advanced Micro Devices, Inc.
# ######################################################################################################################

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(ROCMChecks)
message(DEPRECATION
"Use of find_package(ROCM) is deprecated, please switch to find_package(ROCmCMakeBuildTools)."
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then, you probably need to change the message to something like

    "Use of find_package(ROCM) will be deprecated soon, please switch to find_package(ROCmCMakeBuildTools)."

)
find_package(ROCmCMakeBuildTools HINTS "${CMAKE_CURRENT_LIST_DIR}")
7 changes: 7 additions & 0 deletions share/rocm/cmake/ROCMConfigVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# ######################################################################################################################
# Copyright (C) 2023 Advanced Micro Devices, Inc.
# ######################################################################################################################

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../rocmcmakebuildtools/cmake)

include(ROCmCMakeBuildToolsConfigVersion)
0 share/rocm/cmake/ROCMAnalyzers.cmake → ...cmakebuildtools/cmake/ROCMAnalyzers.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMCheckTargetIds.cmake → ...buildtools/cmake/ROCMCheckTargetIds.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMChecks.cmake → ...ocmcmakebuildtools/cmake/ROCMChecks.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMClangTidy.cmake → ...cmakebuildtools/cmake/ROCMClangTidy.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMClients.cmake → ...cmcmakebuildtools/cmake/ROCMClients.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMCppCheck.cmake → ...mcmakebuildtools/cmake/ROCMCppCheck.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMCreatePackage.cmake → ...ebuildtools/cmake/ROCMCreatePackage.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMDocs.cmake → .../rocmcmakebuildtools/cmake/ROCMDocs.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMDoxygenDoc.cmake → ...makebuildtools/cmake/ROCMDoxygenDoc.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMHeaderWrapper.cmake → ...ebuildtools/cmake/ROCMHeaderWrapper.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMInstallSymlinks.cmake → ...uildtools/cmake/ROCMInstallSymlinks.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMInstallTargets.cmake → ...buildtools/cmake/ROCMInstallTargets.cmake
View file
Open in desktop
File renamed without changes.
0 ...rocm/cmake/ROCMPackageConfigHelpers.cmake → ...ools/cmake/ROCMPackageConfigHelpers.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMProperty.cmake → ...mcmakebuildtools/cmake/ROCMProperty.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMSetupVersion.cmake → ...kebuildtools/cmake/ROCMSetupVersion.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMSphinxDoc.cmake → ...cmakebuildtools/cmake/ROCMSphinxDoc.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMTest.cmake → .../rocmcmakebuildtools/cmake/ROCMTest.cmake
View file
Open in desktop
File renamed without changes.
0 share/rocm/cmake/ROCMUtilities.cmake → ...cmakebuildtools/cmake/ROCMUtilities.cmake
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions share/rocmcmakebuildtools/cmake/ROCmCMakeBuildToolsConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ######################################################################################################################
# Copyright (C) 2017 Advanced Micro Devices, Inc.
# ######################################################################################################################

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(ROCMChecks)
0 share/rocm/cmake/header_template.h.in → ...makebuildtools/cmake/header_template.h.in
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions test/analyze/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(simple LANGUAGES CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMAnalyzers)
Expand All @@ -15,7 +15,7 @@ include(ROCMSetupVersion)
include(ROCMClangTidy)
rocm_enable_clang_tidy(
DEV_WARNINGS_AS_ERRORS
CHECKS
CHECKS
*
-llvmlibc-*
ERRORS
Expand All @@ -26,10 +26,10 @@ rocm_enable_clang_tidy(
include(ROCMCppCheck)
rocm_enable_cppcheck(
INCONCLUSIVE
CHECKS
CHECKS
warning
FORCE
SUPPRESS
SUPPRESS
unmatchedSuppression
SOURCES
simple.cpp
Expand Down
2 changes: 1 addition & 1 deletion test/libbasic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(basic CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)
find_package(simple)

include(ROCMInstallTargets)
Expand Down
20 changes: 10 additions & 10 deletions test/libheaderonly/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(headeronly LANGUAGES NONE)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMPackageConfigHelpers)
Expand All @@ -18,15 +18,15 @@ rocm_setup_version(VERSION 1.0.0)

if(ROCM_PREFIX)
rocm_create_package(
NAME headeronly
NAME headeronly
PREFIX ${ROCM_PREFIX}
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG
HEADER_ONLY)
else()
rocm_create_package(
NAME headeronly
NAME headeronly
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG
Expand All @@ -38,15 +38,15 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)

add_library(headeronly INTERFACE)
target_include_directories(headeronly
INTERFACE
target_include_directories(headeronly
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:headeronly/include/>)

if(ROCM_PREFIX)
rocm_install_targets(
TARGETS headeronly
INCLUDE include
TARGETS headeronly
INCLUDE include
PREFIX ${ROCM_PREFIX})
rocm_install(
DIRECTORY
Expand All @@ -58,8 +58,8 @@ if(ROCM_PREFIX)
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
)
rocm_export_targets(
TARGETS headeronly
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake
TARGETS headeronly
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake
PREFIX ${ROCM_PREFIX})
rocm_install_symlink_subdir(${ROCM_PREFIX})
else()
Expand All @@ -76,6 +76,6 @@ else()
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
)
rocm_export_targets(
TARGETS headeronly
TARGETS headeronly
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake)
endif()
6 changes: 3 additions & 3 deletions test/libsimple/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(simple CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMPackageConfigHelpers)
Expand All @@ -18,14 +18,14 @@ rocm_setup_version(VERSION 1.0.0)

if(ROCM_PREFIX)
rocm_create_package(
NAME simple
NAME simple
PREFIX ${ROCM_PREFIX}
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
else()
rocm_create_package(
NAME simple
NAME simple
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
Expand Down
6 changes: 3 additions & 3 deletions test/libsimple2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(simple2 CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMPackageConfigHelpers)
Expand All @@ -20,13 +20,13 @@ rocm_setup_version(VERSION 1.0.0)

if(ROCM_PREFIX)
rocm_create_package(
NAME simple2
NAME simple2
PREFIX ${ROCM_PREFIX}
MAINTAINER "Amd amd@amd.com"
LDCONFIG)
else()
rocm_create_package(
NAME simple2
NAME simple2
MAINTAINER "Amd amd@amd.com"
LDCONFIG)
endif()
Expand Down
4 changes: 2 additions & 2 deletions test/libsimpletest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(simple CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMPackageConfigHelpers)
Expand All @@ -20,7 +20,7 @@ rocm_setup_version(VERSION 1.0.0)
rocm_enable_test_package(simple)

rocm_create_package(
NAME simple
NAME simple
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
Expand Down
6 changes: 3 additions & 3 deletions test/libwrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake_minimum_required (VERSION 3.5)
project(test-wrapper CXX)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMInstallTargets)
include(ROCMPackageConfigHelpers)
Expand All @@ -19,14 +19,14 @@ rocm_setup_version(VERSION 1.0.0)

if(ROCM_PREFIX)
rocm_create_package(
NAME wrapper
NAME wrapper
PREFIX ${ROCM_PREFIX}
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
else()
rocm_create_package(
NAME wrapper
NAME wrapper
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
Expand Down
2 changes: 1 addition & 1 deletion test/test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ macro(test_exec)
endmacro()

macro(use_rocm_cmake)
list(APPEND CMAKE_MODULE_PATH ${PREFIX}/share/rocm/cmake)
list(APPEND CMAKE_MODULE_PATH ${PREFIX}/share/rocmcmakebuildtools/cmake)
endmacro()

function(configure_dir DIR)
Expand Down
2 changes: 1 addition & 1 deletion test/toolchain-var/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


cmake_minimum_required (VERSION 3.5)
find_package(ROCM)
find_package(ROCmCMakeBuildTools)
project(toolchain-var CXX)

if(CHANGE_TOOLCHAIN)
Expand Down
4 changes: 2 additions & 2 deletions test/version/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake_minimum_required (VERSION 3.5)
project(simple LANGUAGES NONE)

find_package(ROCM)
find_package(ROCmCMakeBuildTools)

include(ROCMSetupVersion)
include(ROCMCreatePackage)
Expand All @@ -32,7 +32,7 @@ endmacro()
@CONTENT@

rocm_create_package(
NAME simple
NAME simple
MAINTAINER "Amd amd@amd.com"
PTH
LDCONFIG)
Loading