Skip to content

Commit f6fcfe7

Browse files
lawruble13samjwu
andauthored
HOTFIX: Update version number and changelog for ROCm 6.1 (#184)
* Update version number and changelog for ROCm 6.1 * Update documentation to match ROCm (#142) * Update documentation requirements files * Disable docsphinx test on macOS (#167) --------- Co-authored-by: Sam Wu <sam.wu2@amd.com>
1 parent c364583 commit f6fcfe7

34 files changed

+384
-90
lines changed

.github/dependabot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
version: 2
6+
updates:
7+
- package-ecosystem: "pip" # See documentation for possible values
8+
directory: "/docs" # Location of package manifests
9+
open-pull-requests-limit: 10
10+
schedule:
11+
interval: "daily"
12+
labels:
13+
- "documentation"
14+
- "dependencies"
15+
- "ci:docs-only"
16+
reviewers:
17+
- "samjwu"

.github/workflows/test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
python -m pip install --upgrade setuptools pip wheel
5858
python -m pip install cget ninja
59-
python -m pip install -r doc/requirements.txt
59+
python -m pip install -r docs/requirements.txt
6060
python -m pip install -r test/docsphinx/docs/.sphinx/requirements.txt
6161
- name: Install Doxygen
6262
uses: ssciwr/doxygen-install@v1
@@ -69,4 +69,3 @@ jobs:
6969
cget build -T doc
7070
cget build -Cy --test -DROCM_CMAKE_GENERATOR=Ninja
7171
cget build -T doc
72-

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
.vs*/**/*
2-
build/**/*
2+
build/**/*
3+
docs/_build/
4+
docs/sphinx/_toc.yml

.readthedocs.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Read the Docs configuration file
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
version: 2
5+
6+
sphinx:
7+
configuration: docs/src/conf.py
8+
9+
formats: [htmlzip, pdf, epub]
10+
11+
python:
12+
install:
13+
- requirements: docs/requirements.txt
14+
15+
build:
16+
os: ubuntu-22.04
17+
tools:
18+
python: "3.8"

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log for rocm-cmake
22

3+
## [rocm-cmake 0.12.0 for ROCm 6.1.0]
4+
### Changed
5+
- ROCMSphinxDoc: Allow separate source and config directories.
6+
- ROCMCreatePackage: Allow additional `PROVIDES` on header-only packages.
7+
- ROCMInstallTargets: Don't install executable targets by default for ASAN builds.
8+
- ROCMTest: Add RPATH for installed tests.
9+
- Finalize rename to ROCmCMakeBuildTools
10+
### Fixed
11+
- ROCMClangTidy: Fixed invalid list index.
12+
- Test failures when ROCM_CMAKE_GENERATOR is empty.
13+
14+
315
## [rocm-cmake 0.11.0 for ROCm 6.0.0]
416
### Changed
517
- ROCMSphinxDoc: Improved validation, documentation and rocm-docs-core integration.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/share/rocmcmakebuildtool
2020
include(ROCMCreatePackage)
2121
include(ROCMSetupVersion)
2222

23-
rocm_setup_version(VERSION 0.11.0)
23+
rocm_setup_version(VERSION 0.12.0)
2424

2525
include(CMakePackageConfigHelpers)
2626
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ROCmCMakeBuildToolsConfigVersion.cmake
@@ -43,4 +43,4 @@ add_custom_target(format COMMAND cmake-format -i ${CMAKE_FILES} WORKING_DIRECTOR
4343
enable_testing()
4444
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR})
4545
add_subdirectory(test)
46-
add_subdirectory(doc)
46+
add_subdirectory(docs)

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
rocm-cmake
2-
==================
1+
# rocm-cmake
32

43
rocm-cmake is a collection of CMake modules for common build and development
54
tasks within the ROCm project. It is therefore a build dependency for many of
@@ -10,8 +9,10 @@ it is required for building some of the libraries that are _a part of_ ROCm.
109

1110
To install from source, run:
1211

13-
mkdir build
14-
cd build
15-
cmake ..
16-
cmake --build .
17-
sudo cmake --build . --target install
12+
```bash
13+
mkdir build
14+
cd build
15+
cmake ..
16+
cmake --build .
17+
sudo cmake --build . --target install
18+
```

doc/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include(ROCMSphinxDoc)
2+
rocm_add_sphinx_doc(${CMAKE_CURRENT_LIST_DIR}/src
3+
BUILDER html
4+
OUTPUT_DIR html
5+
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sphinx==4.1.2
2-
sphinxcontrib-moderncmakedomain==3.19
1+
sphinxcontrib-moderncmakedomain==3.19
2+
rocm-docs-core==0.38.1

0 commit comments

Comments
 (0)