From f9da26b35f68f6c8440959aebd278652afb790c9 Mon Sep 17 00:00:00 2001 From: jharryma Date: Fri, 11 Apr 2025 07:41:06 -0700 Subject: [PATCH 1/2] update tooling docs to 6.4 --- README.md | 22 +++------ default.xml | 4 +- tools/autotag/README.md | 8 ++-- tools/autotag/components.xml | 4 +- tools/rocm-build/rocm-6.4.0.xml | 79 +++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 22 deletions(-) create mode 100644 tools/rocm-build/rocm-6.4.0.xml diff --git a/README.md b/README.md index c2bddf045..2a00914cf 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ The following example shows how to use the repo tool to download the ROCm source ```bash mkdir -p ~/ROCm/ cd ~/ROCm/ -export ROCM_VERSION=6.3.3 -~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.3.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml +export ROCM_VERSION=6.4.0 +~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.4.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml ~/bin/repo sync ``` @@ -77,8 +77,8 @@ The Build time will reduce significantly if we limit the GPU Architecture/s agai mkdir -p ~/WORKSPACE/ # Or any folder name other than WORKSPACE cd ~/WORKSPACE/ -export ROCM_VERSION=6.3.3 -~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.3.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml +export ROCM_VERSION=6.4.0 +~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.4.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml ~/bin/repo sync # -------------------------------------- @@ -87,12 +87,10 @@ export ROCM_VERSION=6.3.3 # Option 1: Start a docker container # Pulling required base docker images: -# Ubuntu20.04 built from ROCm/tools/rocm-build/docker/ubuntu20/Dockerfile -docker pull rocm/rocm-build-ubuntu-20.04:6.3 # Ubuntu22.04 built from ROCm/tools/rocm-build/docker/ubuntu22/Dockerfile -docker pull rocm/rocm-build-ubuntu-22.04:6.3 +docker pull rocm/rocm-build-ubuntu-22.04:6.4 # Ubuntu24.04 built from ROCm/tools/rocm-build/docker/ubuntu24/Dockerfile -docker pull rocm/rocm-build-ubuntu-24.04:6.3 +docker pull rocm/rocm-build-ubuntu-24.04:6.4 # Start docker container and mount the source code folder: docker run -ti \ @@ -109,10 +107,6 @@ docker run -ti \ bash # Option 2: Install required packages into the host machine -# For ubuntu20.04 system -cd ROCm/tools/rocm-build/docker/ubuntu20 -cp * /tmp && cd /tmp -bash install-prerequisites.sh # For ubuntu22.04 system cd ROCm/tools/rocm-build/docker/ubuntu22 cp * /tmp && cd /tmp @@ -143,15 +137,11 @@ make -f ROCm/tools/rocm-build/ROCm.mk list_components # Build a single ROCm packages make -f ROCm/tools/rocm-build/ROCm.mk T_rocblas -# Find built packages in ubuntu20.04: -out/ubuntu-20.04/20.04/deb/ # Find built packages in ubuntu22.04: out/ubuntu-22.04/22.04/deb/ # Find built packages in ubuntu24.04: out/ubuntu-24.04/24.04/deb/ -# Find built logs in ubuntu20.04: -out/ubuntu-20.04/20.04/logs/ # Find built logs in ubuntu22.04: out/ubuntu-22.04/22.04/logs/ # Find built logs in ubuntu24.04: diff --git a/default.xml b/default.xml index 1617d808e..efebae568 100644 --- a/default.xml +++ b/default.xml @@ -1,7 +1,7 @@ - @@ -30,6 +30,7 @@ + @@ -62,6 +63,7 @@ + diff --git a/tools/autotag/README.md b/tools/autotag/README.md index 9ae34b955..c637b9494 100755 --- a/tools/autotag/README.md +++ b/tools/autotag/README.md @@ -20,16 +20,16 @@ * Run this for 5.6.0 (change for whatever version you require) * `GITHUB_ACCESS_TOKEN=my_token_here` -To generate the changelog from 5.0.0 up to and including 6.2.0: +To generate the changelog from 5.0.0 up to and including 6.4.0: ```sh -python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --starting-version=5.0.0 --compile_file ../../CHANGELOG.md --branch release/rocm-rel-6.2 6.2.0 +python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --starting-version=5.0.0 --compile_file ../../CHANGELOG.md --branch release/rocm-rel-6.4 6.4.0 ``` -To generate the release notes only for 6.2.0: +To generate the release notes only for 6.4.0: ```sh -python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --compile_file ../../RELEASE.md --branch release/rocm-rel-6.2 6.2.0 +python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --compile_file ../../RELEASE.md --branch release/rocm-rel-6.4 6.4.0 ``` ### Notes diff --git a/tools/autotag/components.xml b/tools/autotag/components.xml index 7b5fc7a17..5aa3c3ad1 100644 --- a/tools/autotag/components.xml +++ b/tools/autotag/components.xml @@ -1,7 +1,7 @@ - @@ -27,6 +27,7 @@ + @@ -52,6 +53,7 @@ + diff --git a/tools/rocm-build/rocm-6.4.0.xml b/tools/rocm-build/rocm-6.4.0.xml new file mode 100644 index 000000000..e4f56126b --- /dev/null +++ b/tools/rocm-build/rocm-6.4.0.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 42b5e8da729b07a235fe8682ad8b29dbbf580b69 Mon Sep 17 00:00:00 2001 From: jharryma Date: Fri, 11 Apr 2025 14:14:45 -0400 Subject: [PATCH 2/2] Update tools/rocm-build/rocm-6.4.0.xml Co-authored-by: Sam Wu <22262939+samjwu@users.noreply.github.com> --- tools/rocm-build/rocm-6.4.0.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rocm-build/rocm-6.4.0.xml b/tools/rocm-build/rocm-6.4.0.xml index e4f56126b..d9df0e040 100644 --- a/tools/rocm-build/rocm-6.4.0.xml +++ b/tools/rocm-build/rocm-6.4.0.xml @@ -6,7 +6,7 @@ sync-c="true" sync-j="4" /> - +