From 133820ef4d48180e3f5ade215a613185f3c633da Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Mon, 12 Feb 2024 13:13:22 -0700 Subject: [PATCH 1/4] Update version number and changelog for ROCm 6.1 (#169) --- CHANGELOG.md | 14 ++++++++++++++ CMakeLists.txt | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bda5f369..bbf7ee87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log for rocm-cmake +## [rocm-cmake 0.12.0 for ROCm 6.1.0] +### Added +- ROCMTest: Add rpath to installed tests +- AOCMCreatePackage: Allow additional provides on header-only packages +- ROCMSphinxDoc: Allow separate source and config directories +### Changed +- Renamed CMake package to ROCmCMakeBuildTools. A wrapper has been provided + to ensure that `find_package(ROCM)` continues to work, but it is recommended + that developers switch to `find_package(ROCmCMakeBuildTools)` +- ROCMInstallTargets: Stopped installing executables in ASAN builds +### Fixed +- ROCMClangTidy: Fixed invalid list index in clang tidy +- Fixed test failures when `ROCM_CMAKE_GENERATOR` is an empty string + ## [rocm-cmake 0.11.0 for ROCm 6.0.0] ### Changed - ROCMSphinxDoc: Improved validation, documentation and rocm-docs-core integration. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ac51890..f53cb17a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/share/rocmcmakebuildtool include(ROCMCreatePackage) include(ROCMSetupVersion) -rocm_setup_version(VERSION 0.11.0) +rocm_setup_version(VERSION 0.12.0) include(CMakePackageConfigHelpers) write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ROCmCMakeBuildToolsConfigVersion.cmake From 71ee134c22f4b3446d9237778c85584d7351a0a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:06:05 -0600 Subject: [PATCH 2/4] Bump rocm-docs-core from 0.38.0 to 0.38.1 in /docs (#183) Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.38.0 to 0.38.1. - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases) - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](https://github.com/RadeonOpenCompute/rocm-docs-core/compare/v0.38.0...v0.38.1) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/requirements.in | 2 +- docs/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.in b/docs/requirements.in index 3f4f6f30..daacbe30 100644 --- a/docs/requirements.in +++ b/docs/requirements.in @@ -1,2 +1,2 @@ sphinxcontrib-moderncmakedomain==3.19 -rocm-docs-core==0.38.0 +rocm-docs-core==0.38.1 diff --git a/docs/requirements.txt b/docs/requirements.txt index de32ceb2..bc500f7c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -94,7 +94,7 @@ requests==2.31.0 # via # pygithub # sphinx -rocm-docs-core==0.38.0 +rocm-docs-core==0.38.1 # via -r requirements.in six==1.16.0 # via python-dateutil From c586dd9533b27aa46af92ba30fbbe8a720381905 Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Wed, 17 Apr 2024 14:23:58 -0500 Subject: [PATCH 3/4] Update install path of tests into a standard directory (#164) * Update install path of tests into a standard directory * Update tests --- share/rocmcmakebuildtools/cmake/ROCMTest.cmake | 2 +- test/pass/simple-test-package.cmake | 2 +- test/pass/simple-test.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake index a6565e7c..8d5a7231 100644 --- a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake +++ b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake @@ -25,7 +25,7 @@ add_dependencies(install-tests tests) rocm_define_property(TARGET "ROCM_TEST_INSTALLDIR" "Install dir for tests") macro(rocm_enable_test_package NAME) message(STATUS "Enable test package ${NAME}") - set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_PREFIX}/share/test/${NAME}) + set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_PREFIX}/libexec/installed-tests/${NAME}) rocm_package_setup_component(tests DEPENDS COMPONENT runtime) rocm_defer(rocm_test_install_ctest) endmacro() diff --git a/test/pass/simple-test-package.cmake b/test/pass/simple-test-package.cmake index 05ecea49..b60b1755 100644 --- a/test/pass/simple-test-package.cmake +++ b/test/pass/simple-test-package.cmake @@ -8,4 +8,4 @@ list(LENGTH TEST_PACKAGE NTEST_PACKAGE) test_expect_eq(${NTEST_PACKAGE} 1) test_exec(COMMAND ${CMAKE_COMMAND} -E tar t ${TEST_PACKAGE}) test_exec(COMMAND ${CMAKE_COMMAND} -E tar x ${TEST_PACKAGE} WORKING_DIRECTORY /) -test_expect_file(${PREFIX}/share/test/simple/CTestTestfile.cmake) +test_expect_file(${PREFIX}/libexec/installed-tests/simple/CTestTestfile.cmake) diff --git a/test/pass/simple-test.cmake b/test/pass/simple-test.cmake index 2d29dcc4..20a85cca 100644 --- a/test/pass/simple-test.cmake +++ b/test/pass/simple-test.cmake @@ -3,5 +3,5 @@ # ###################################################################################################################### install_dir(${TEST_DIR}/libsimpletest TARGETS check install-tests) -test_expect_file(${PREFIX}/share/test/simple/CTestTestfile.cmake) -test_exec(COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure WORKING_DIRECTORY ${PREFIX}/share/test/simple) +test_expect_file(${PREFIX}/libexec/installed-tests/simple/CTestTestfile.cmake) +test_exec(COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure WORKING_DIRECTORY ${PREFIX}/libexec/installed-tests/simple) From f0d3cd7ce6a70f7d4cd0ccc5f48ad49c3911cff1 Mon Sep 17 00:00:00 2001 From: Joseph Macaranas <145489236+amd-jmacaran@users.noreply.github.com> Date: Thu, 2 May 2024 15:04:34 -0400 Subject: [PATCH 4/4] Add support for external CI builds using Azure Pipelines (#186) * Add support for external CI builds using Azure Pipelines * Change token name to match IT-created token --- .azuredevops/rocm-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .azuredevops/rocm-ci.yml diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml new file mode 100644 index 00000000..096c97c3 --- /dev/null +++ b/.azuredevops/rocm-ci.yml @@ -0,0 +1,38 @@ +resources: + repositories: + - repository: pipelines_repo + type: github + endpoint: ROCm + name: ROCm/ROCm + +variables: +- group: common +- template: /.azuredevops/variables-global.yml@pipelines_repo + +trigger: + batch: true + branches: + include: + - develop + paths: + exclude: + - .github + - '.*.y*ml' + - '*.md' + - LICENSE + +pr: + autoCancel: true + branches: + include: + - develop + paths: + exclude: + - .github + - '.*.y*ml' + - '*.md' + - LICENSE + drafts: false + +jobs: + - template: ${{ variables.CI_COMPONENT_PATH }}/rocm-cmake.yml@pipelines_repo