Skip to content

Commit

Permalink
Merge Develop into docs/6.1.0
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit a5f975a
Merge: 96b9de3 f844651
Author: Sam Wu <[email protected]>
Date:   Wed Mar 27 11:31:13 2024 -0600

    Merge pull request #118 from ROCm/dependabot/pip/docs/sphinx/rocm-docs-core-0.38.0

    build(deps): Bump rocm-docs-core from 0.37.0 to 0.38.0 in /docs/sphinx

commit 96b9de3
Author: Young Hui - AMD <[email protected]>
Date:   Wed Mar 27 13:06:57 2024 -0400

    update MI300A OS support (#116)

    * update MI300A OS support

    * whitespace

commit f844651
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Mar 27 11:14:49 2024 +0000

    build(deps): Bump rocm-docs-core from 0.37.0 to 0.38.0 in /docs/sphinx

    Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.37.0 to 0.38.0.
    - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
    - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
    - [Commits](ROCm/rocm-docs-core@v0.37.0...v0.38.0)

    ---
    updated-dependencies:
    - dependency-name: rocm-docs-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit fba4a54
Author: Young Hui - AMD <[email protected]>
Date:   Tue Mar 26 11:48:13 2024 -0400

    Bump rocm and amdgpu install instructions to 6.1 from 6.0.2 (#112)

    * Update table for MI300X

    * bump rocm and amdgpu version to 6.1 from 6.0.2

    * Spelling/wording

commit 992d850
Author: Young Hui - AMD <[email protected]>
Date:   Mon Mar 25 12:15:12 2024 -0400

    update SLES prerequisites to use Perl from 15.5 (#111)

commit b2ecbc0
Author: Young Hui - AMD <[email protected]>
Date:   Mon Mar 25 09:58:56 2024 -0400

    Fix Ubuntu kernel version (#110)

    https://www.phoronix.com/news/Ubuntu-22.04.4-LTS-Released

commit 73bff69
Author: Lisa <[email protected]>
Date:   Fri Mar 22 18:05:01 2024 -0600

    Update .wordlist.txt (#107)

commit 80c3f61
Author: Logan Grado <[email protected]>
Date:   Fri Mar 22 15:32:36 2024 -0700

    Docker update (#92)

    Co-authored-by: Lisa <[email protected]>
    Co-authored-by: Saad Rahim (AMD) <[email protected]>
    Co-authored-by: Sam Wu <[email protected]>

commit 5356159
Author: Bence Parajdi <[email protected]>
Date:   Fri Mar 22 22:45:46 2024 +0100

    add multi version install guide (#83)

    * add multi version install guide

    * use templates in command line samples

    * rename variable to rocm_latest_versions

    * fix multi-versioned install to align with the description

    * fix rocm_latest_versions variable not rendering

    * separate multi-version install from the basic install steps

    * fix install sections to the multi-version install

    * fix no substitution

    * add a short description to multi-install
    fix some minor errors

    * change versions in multi version install

    * update multi-version to 6.0.2 and 6.0.0, and fix ubuntu install instructions

    * forgot another instance of apt update

    ---------

    Co-authored-by: Young Hui <[email protected]>

commit 5be16ee
Author: Young Hui - AMD <[email protected]>
Date:   Fri Mar 22 15:39:19 2024 -0400

    cleanup supported OSes (#106)

commit 0e71230
Merge: 9d2a950 c0617d5
Author: Sam Wu <[email protected]>
Date:   Fri Mar 22 10:59:18 2024 -0600

    Merge pull request #105 from samjwu/pytorch-typo

    docs(pytorch-install.rst): Fix path typo when cloning PyTorch repo

commit c0617d5
Author: Sam Wu <[email protected]>
Date:   Fri Mar 22 10:19:19 2024 -0600

    docs(pytorch-install.rst): Fix path typo when cloning PyTorch repo

commit 9d2a950
Merge: e707557 19bc156
Author: Sam Wu <[email protected]>
Date:   Wed Mar 20 09:23:01 2024 -0600

    Merge pull request #102 from ROCm/dependabot/pip/docs/sphinx/rocm-docs-core-0.37.0

    build(deps): Bump rocm-docs-core from 0.36.0 to 0.37.0 in /docs/sphinx

commit 19bc156
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Mar 20 11:54:18 2024 +0000

    build(deps): Bump rocm-docs-core from 0.36.0 to 0.37.0 in /docs/sphinx

    Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.36.0 to 0.37.0.
    - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
    - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
    - [Commits](ROCm/rocm-docs-core@v0.36.0...v0.37.0)

    ---
    updated-dependencies:
    - dependency-name: rocm-docs-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit e707557
Merge: 3367ce2 d16e9db
Author: Sam Wu <[email protected]>
Date:   Tue Mar 19 15:42:09 2024 -0600

    Merge pull request #98 from samjwu/bot

    Update dependabot config

commit d16e9db
Author: Sam Wu <[email protected]>
Date:   Tue Mar 19 14:56:08 2024 -0600

    Update dependabot config

commit 3367ce2
Merge: 9542ae8 cfba2a4
Author: Sam Wu <[email protected]>
Date:   Tue Mar 19 14:53:34 2024 -0600

    Merge pull request #88 from ROCm/dependabot/pip/docs/sphinx/rocm-docs-core-0.36.0

    build(deps): Bump rocm-docs-core from 0.35.1 to 0.36.0 in /docs/sphinx

commit cfba2a4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Mar 12 11:29:05 2024 +0000

    build(deps): Bump rocm-docs-core from 0.35.1 to 0.36.0 in /docs/sphinx

    Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.35.1 to 0.36.0.
    - [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
    - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
    - [Commits](ROCm/rocm-docs-core@v0.35.1...v0.36.0)

    ---
    updated-dependencies:
    - dependency-name: rocm-docs-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
yhuiYH committed Mar 28, 2024
1 parent 5cb1049 commit ca5712b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
14 changes: 7 additions & 7 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
# https://www.sphinx-doc.org/en/master/usage/configuration.html

# ROCm version numbers
rocm_version = '6.0.2'
rocm_multi_versions = '6.0.2 6.0.0'
rocm_directory_version = '6.0.2' # in 6.0 rocm was located in /opt/rocm-6.0.0
amdgpu_version = '6.0.2' # directory in https://repo.radeon.com/rocm/apt/ and https://repo.radeon.com/amdgpu-install/
amdgpu_install_version = '6.0.60002-1' # version in https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/
rocm_version = '6.1'
rocm_multi_versions = '6.1.0 6.0.2'
rocm_directory_version = '6.1.0' # in 6.0 rocm was located in /opt/rocm-6.0.0
amdgpu_version = '6.1' # directory in https://repo.radeon.com/rocm/apt/ and https://repo.radeon.com/amdgpu-install/
amdgpu_install_version = '6.1.60100-1' # version in https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/

latex_engine = "xelatex"
latex_elements = {
Expand All @@ -24,8 +24,8 @@
project = "ROCm installation on Linux"
author = "Advanced Micro Devices, Inc."
copyright = "Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved."
version = "6.0.2"
release = "6.0.2"
version = "6.1.0"
release = "6.1.0"
setting_all_article_info = True
all_article_info_os = ["linux"]
all_article_info_author = ""
Expand Down
8 changes: 5 additions & 3 deletions docs/reference/system-requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ GPU is not listed on this table, it's not officially supported by AMD.
:widths: 50, 25, 25, 10
:header: "GPU", "Architecture", "LLVM target", "Support"

"AMD Instinct MI300X", "CDNA3", "gfx942", "✅"
"AMD Instinct MI300A", "CDNA3", "gfx942", "✅ :sup:`1`"
"AMD Instinct MI300X", "CDNA3", "gfx942", "✅ :sup:`1`"
"AMD Instinct MI300A", "CDNA3", "gfx942", "✅ :sup:`2`"
"AMD Instinct MI250X", "CDNA2", "gfx90a", "✅"
"AMD Instinct MI250", "CDNA2", "gfx90a", "✅"
"AMD Instinct MI210", "CDNA2", "gfx90a", "✅"
Expand Down Expand Up @@ -62,7 +62,9 @@ ROCm product.

❌: **Unsupported** - This configuration is not enabled in our software distributions.

:sup:`1` MI300A is currently not officially supported on RHEL 9.x. This will be added on a later date.
:sup:`1` MI300X is only officially supported on Ubuntu 22.04.4.

:sup:`2` MI300A is only officially supported on Ubuntu 22.04.4, RHEL 9.3, RHEL 8.9 and SLES 15 SP5.

.. _supported_distributions:

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rocm-docs-core==0.37.0
rocm-docs-core==0.38.0
Sphinx-Substitution-Extensions==2022.2.16
sphinxcontrib.datatemplates==0.11.0
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ requests==2.31.0
# via
# pygithub
# sphinx
rocm-docs-core==0.37.0
rocm-docs-core==0.38.0
# via -r requirements.in
smmap==5.0.0
# via gitdb
Expand Down

0 comments on commit ca5712b

Please sign in to comment.