Cherrypick fix into 6.2.0

.wordlist.txt

@@ -12,6 +12,7 @@ FWDEV
 hostname
 hotplug
 IFWI
+IGP
 IIO
 IRQs
 MACVTAP
@@ -21,7 +22,7 @@ PLX
 preconfigured
 Repo
 rocHPL
-ROCmVersionWithoutCommas
+ROCmVersion
 SBR
 SMCi
 SVM

docs/conf.py

@@ -6,7 +6,8 @@
 
 # ROCm version numbers
 rocm_version = '6.2'
-rocm_multi_versions = '6.2.0 6.1.2'
+rocm_multi_versions = '6.2 6.1.2' # in 6.2, the folder names on repo.radeon.com use 6.2 for minor releases
+rocm_multi_versions_package_versions = '6.2.0 6.1.2' # however, in multi, the packages use 6.2.0
 rocm_directory_version = '6.2.0' # in 6.0 rocm was located in /opt/rocm-6.0.0
 amdgpu_version = '6.2' # directory in https://repo.radeon.com/rocm/apt/ and https://repo.radeon.com/amdgpu-install/
 amdgpu_install_version = '6.2.60200-1' # version in https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/
@@ -40,8 +41,6 @@
 
 exclude_patterns = [
     'temp', 
-    'install/native-install/install-rocm-template.rst', 
-    'install/native-install/uninstall-rocm-template.rst',
     'install/native-install/includes/rhel-multi-install.rst',
     'install/native-install/includes/sles-multi-install.rst',
     'install/native-install/includes/ubuntu-multi-install.rst'
@@ -66,6 +65,7 @@
 rst_prolog = f"""
 .. |rocm_version| replace:: {rocm_version}
 .. |rocm_multi_versions| replace:: {rocm_multi_versions}
+.. |rocm_multi_versions_package_versions| replace:: {rocm_multi_versions_package_versions}
 .. |amdgpu_version| replace:: {amdgpu_version}
 .. |rocm_directory_version| replace:: {rocm_directory_version}
 .. |amdgpu_install_version| replace:: {amdgpu_install_version}

docs/install/3rd-party/pytorch-install.rst

@@ -75,38 +75,38 @@ wheels command, you must select 'Linux', 'Python', 'pip', and 'ROCm' in the matr
 
           * - Base OS
             - Docker Image
-          * - Ubuntu 20.04
-            - `rocm/dev-ubuntu-20.04 <https://hub.docker.com/r/rocm/dev-ubuntu-20.04>`_
           * - Ubuntu 22.04
             - `rocm/dev-ubuntu-22.04 <https://hub.docker.com/r/rocm/dev-ubuntu-22.04>`_
+          * - Ubuntu 24.04
+            - `rocm/dev-ubuntu-24.04 <https://hub.docker.com/r/rocm/dev-ubuntu-24.04>`_
 
    b. Pull the selected image.
 
    .. code-block:: bash
 
-       docker pull rocm/dev-ubuntu-20.04:latest
+       docker pull rocm/dev-ubuntu-22.04:latest
 
    c. Start a Docker container using the downloaded image.
 
    .. code-block:: bash
 
-       docker run -it --device=/dev/kfd --device=/dev/dri --group-add video rocm/dev-ubuntu-20.04:latest
+       docker run -it --device=/dev/kfd --device=/dev/dri --group-add video rocm/dev-ubuntu-22.04:latest
 
    **Option 2:**
 
    Select a base OS Docker image (Check :ref:`system-requirements`)
 
-   Pull selected base OS image (Ubuntu 20.04 for example)
+   Pull selected base OS image (Ubuntu 22.04 for example)
 
    .. code-block:: bash
 
-       docker pull ubuntu:20.04
+       docker pull ubuntu:22.04
 
    Start a Docker container using the downloaded image
 
    .. code-block:: bash
 
-       docker run -it --device=/dev/kfd --device=/dev/dri --group-add video ubuntu:20.04
+       docker run -it --device=/dev/kfd --device=/dev/dri --group-add video ubuntu:22.04
 
    Install ROCm using the directions in the :ref:`rocm-install-overview` section.
 
@@ -128,12 +128,12 @@ wheels command, you must select 'Linux', 'Python', 'pip', and 'ROCm' in the matr
 
    .. note::
 
-       The following command uses the ROCm 6.1 PyTorch wheel. If you want a different version of ROCm,
+       The following command uses the ROCm 6.2 PyTorch wheel. If you want a different version of ROCm,
        modify the command accordingly.
 
    .. code-block:: bash
 
-       pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.1/
+       pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2/
 
 4. (Optional) Use MIOpen kdb files with ROCm PyTorch wheels.
 

docs/install/3rd-party/tensorflow-install.rst

@@ -87,8 +87,7 @@ To install TensorFlow using the wheels package, use the following command.
 
 .. note::
 
-   For details on ``tensorflow-rocm`` wheels and ROCm version compatibility, refer to
-   `<https://github.com/ROCm/tensorflow-upstream/blob/develop-upstream/rocm_docs/tensorflow-rocm-release.md>`__.
+   Prior to ROCm 6.1, ``[wheel-version]`` followed the ``<TensorFlowVersion>.<ROCmVersion>`` format.
 
 .. _test-tensorflow-installation:
 

docs/install/amdgpu-install.rst

@@ -22,7 +22,9 @@ Installation
 
 Installation of ``amdgpu-install`` differs slightly depending on the OS and its package manager.
 
-Make sure that the :doc:`/install/prerequisites` are met before installing.
+.. important::
+
+    Make sure that the :doc:`/install/prerequisites` are met before installing.
 
 Ubuntu
 --------------------------------------------------------------------

docs/install/native-install/includes/rhel-multi-install.rst

@@ -69,7 +69,7 @@
       .. code-block:: bash
          :substitutions:
 
-         for ver in |rocm_multi_versions|; do
+         for ver in |rocm_multi_versions_package_versions|; do
              sudo dnf install rocm$ver
          done
 

docs/install/native-install/includes/sles-multi-install.rst

@@ -34,7 +34,7 @@
       .. code-block:: bash
          :substitutions:
 
-         for ver in |rocm_multi_versions|; do
+         for ver in |rocm_multi_versions_package_versions|; do
              sudo zypper --gpg-auto-import-keys install rocm$ver
          done
 

docs/install/native-install/includes/ubuntu-multi-install.rst

@@ -10,6 +10,9 @@
 
        .. tab-set::
            {% for (os_version, os_release) in config.html_context['ubuntu_version_numbers'] %}
+           {% if os_version == '24.04' %}
+
+           {% else %}
            .. tab-item:: Ubuntu {{ os_version }}
                :sync: ubuntu-{{ os_version}}
 
@@ -21,6 +24,8 @@
                        | sudo tee /etc/apt/sources.list.d/amdgpu.list
                    done
                    sudo apt update
+
+           {% endif %}
            {% endfor %}
 
 .. _ubuntu-multi-register-rocm:
@@ -33,6 +38,9 @@
 
       .. tab-set::
           {% for (os_version, os_release) in config.html_context['ubuntu_version_numbers'] %}
+          {% if os_version == '24.04' %}
+
+          {% else %}
           .. tab-item:: Ubuntu {{ os_version }}
               :sync: ubuntu-{{ os_version}}
 
@@ -46,6 +54,7 @@
                   echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
                       | sudo tee /etc/apt/preferences.d/rocm-pin-600
                   sudo apt update
+          {% endif %}
           {% endfor %}
 
 4. Install ROCm.
@@ -62,12 +71,18 @@
       .. code-block:: bash
          :substitutions:
 
-         for ver in |rocm_multi_versions|; do
+         for ver in |rocm_multi_versions_package_versions|; do
              sudo apt install rocm$ver
          done
 
 5. Complete the :doc:`../post-install`.
 
+.. note::
+
+   Since Ubuntu 24.04 is newly supported with ROCm 6.2, we only have one package to 
+   install on Ubuntu 24.04. As a result, multi-version support is not available for
+   Ubuntu 24.04 as there are no additional versions at this time.
+
 .. tip::
 
    For a single-version installation of the latest ROCm version on Ubuntu,

docs/install/native-install/rhel.rst

@@ -7,9 +7,13 @@
 Red Hat Enterprise Linux native installation
 **********************************************************************************************
 
+.. important::
+
+    Make sure that the :doc:`/install/prerequisites` are met before installing.
+
 .. _rhel-register-repo:
 
-Register repositories
+Registering ROCm repositories
 =====================================================
 
 Register kernel-mode driver
@@ -67,11 +71,29 @@ Register ROCm packages
 
 .. _rhel-install:
 
-.. include:: install-rocm-template.rst
+Installing
+=====================================================
+
+Install kernel driver
+----------------------------------------------------------------------------------------------------------
+
+.. code-block:: bash
+
+    sudo dnf install amdgpu-dkms
+    sudo reboot
+
+Install ROCm packages
+----------------------------------------------------------------------------------------------------------
+
+.. code-block:: bash
+
+    sudo dnf install rocm
+
+Complete the :doc:`../post-install`.
 
 .. _rhel-upgrade:
 
-Upgrade
+Upgrading
 =====================================================
 
 To upgrade an existing ROCm installation to a newer version, follow the steps in
@@ -84,5 +106,50 @@ To upgrade an existing ROCm installation to a newer version, follow the steps in
 
 .. _rhel-uninstall:
 
-.. include:: uninstall-rocm-template.rst
+Uninstalling
+=====================================================
+
+Uninstall specific meta packages
+---------------------------------------------------------------------------
+
+.. code-block:: bash
+    :substitutions:
+
+    # sudo apt autoremove <package-name>
+    # For example:
+    sudo dnf remove rocm
+    # Or for version specific packages:
+    sudo dnf remove rocm|rocm_version|
+
+Uninstall ROCm packages
+---------------------------------------------------------------------------
+
+.. code-block:: bash
+    :substitutions:
+
+    sudo dnf remove rocm-core
+    # Or for version specific packages:
+    sudo dnf remove rocm-core|rocm_version|
+
+Uninstall kernel-mode driver
+---------------------------------------------------------------------------
+
+.. code-block:: bash
+
+    sudo dnf remove amdgpu-dkms
+
+Remove ROCm and AMDGPU repositories
+---------------------------------------------------------------------------
+
+.. code-block:: bash
+
+    # Remove the repositories.
+    sudo rm /etc/yum.repos.d/rocm.list
+    sudo rm /etc/yum.repos.d/amdgpu.list
+
+    # Clear the cache and clean the system.
+    sudo rm -rf /var/cache/yum
+    sudo dnf clean all
 
+    # Restart the system.
+    sudo reboot

docs/install/native-install/sles.rst

@@ -7,6 +7,10 @@
 SUSE Linux Enterprise native installation
 *********************************************************************************************
 
+.. important::
+
+    Make sure that the :doc:`/install/prerequisites` are met before installing.
+
 .. _sles-register-rocm:
 
 Registering ROCm repositories

docs/install/native-install/ubuntu.rst

@@ -6,9 +6,13 @@
 Ubuntu native installation
 ****************************************************************************
 
+.. important::
+
+    Make sure that the :doc:`/install/prerequisites` are met before installing.
+
 .. _ubuntu-register-repo:
 
-Registering repositories
+Registering ROCm repositories
 =================================================
 
 .. _ubuntu-package-key:
@@ -166,5 +170,3 @@ Remove ROCm and AMDGPU repositories
 
     # Restart the system.
     sudo reboot
-
-