add extension to conf.py

add sphinx-build-compatibility extension
remove indentation
2026-01-09 22:58:17 -05:00 · 2024-10-16 15:58:36 -04:00 · 2024-10-16 15:57:28 -04:00 · 2024-10-16 14:53:24 -04:00 · 2024-10-16 14:48:11 -04:00 · 2024-10-01 10:02:01 -04:00
17 changed files with 270 additions and 21 deletions
--- a/.azuredevops/components/AMDMIGraphX.yml
+++ b/.azuredevops/components/AMDMIGraphX.yml
@@ -51,6 +51,26 @@ parameters:
    - rocminfo
    - rocMLIR
    - rocprofiler-register
+    - roctracer
+- name: rocmTestDependencies
+  type: object
+  default:
+    - aomp
+    - aomp-extras
+    - clr
+    - composable_kernel
+    - hipBLAS
+    - hipBLAS-common
+    - hipBLASLt
+    - llvm-project
+    - MIOpen
+    - rocm-cmake
+    - ROCR-Runtime
+    - rocBLAS
+    - rocminfo
+    - rocMLIR
+    - rocprofiler-register
+    - roctracer

 jobs:
 - job: AMDMIGraphX
@@ -104,7 +124,73 @@ jobs:
        -DHALF_INCLUDE_DIR=$(Agent.BuildDirectory)/rocm/include
        -DBUILD_TESTING=ON
        -GNinja
-# REFERENCE: https://github.com/ROCm/composable_kernel/issues/782
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: AMDMIGraphX_testing
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  - name: MIGRAPHX_TRACE_BENCHMARKING
+    value: 1
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+# half version should be fixed to 5.6.0
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencySource: fixed
+      fixedComponentName: half
+      fixedPipelineIdentifier: ${{ variables.HALF560_PIPELINE_ID }}
+      skipLibraryLinking: true
+      skipLlvmSymlink: true
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: CMake@1
+    displayName: MIGraphXTest CMake Flags
+    inputs:
+      cmakeArgs: >-
+        -DCMAKE_BUILD_TYPE=Release
+        -DGPU_TARGETS=$(JOB_GPU_TARGET)
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+        -DCMAKE_MODULE_PATH=$(Agent.BuildDirectory)/rocm/lib/cmake/hip
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm;$(Agent.BuildDirectory)/rocm
+        -DHALF_INCLUDE_DIR=$(Agent.BuildDirectory)/rocm/include
+        -DBUILD_TESTING=ON
+        -DMIGRAPHX_ENABLE_C_API_TEST=ON
+        ..
+  - task: Bash@3
+    displayName: Build and run MIGraphX tests
+    inputs:
+      targetType: inline
+      workingDirectory: build
+      script: make -j$(nproc) check
--- a/.azuredevops/components/MIOpen.yml
+++ b/.azuredevops/components/MIOpen.yml
@@ -8,15 +8,23 @@ parameters:
 - name: aptPackages
  type: object
  default:
-    - software-properties-common
-    - python3-pip
    - cmake
-    - ninja-build
-    - libsqlite3-dev
    - libbz2-dev
-    - nlohmann-json3-dev
-    - libgtest-dev
    - libdrm-dev
+    - libeigen3-dev
+    - libgmock-dev
+    - libgtest-dev
+    - libsqlite3-dev
+    - libstdc++-12-dev
+    - ninja-build
+    - nlohmann-json3-dev
+    - python3-pip
+    - software-properties-common
+    - zstd
+- name: pipModules
+  type: object
+  default:
+    - cget
 - name: rocmDependencies
  type: object
  default:
@@ -35,6 +43,24 @@ parameters:
    - clr
    - rocminfo
    - roctracer
+- name: rocmTestDependencies
+  type: object
+  default:
+    - clr
+    - composable_kernel
+    - half
+    - hipBLAS
+    - hipBLAS-common
+    - hipBLASLt
+    - llvm-project
+    - rocBLAS
+    - rocm-cmake
+    - rocminfo
+    - rocMLIR
+    - ROCR-Runtime
+    - rocprofiler-register
+    - rocRAND
+    - roctracer

 jobs:
 - job: MIOpen
@@ -54,18 +80,16 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
  # The default boost library from apt is 1.74, which does not satisfy MIOpen's build requirement (1.79+)
  # Upgrade boost from apt by following https://launchpad.net/~mhier/+archive/ubuntu/libboost-latest
  - task: Bash@3
-    displayName: 'update boost version'
+    displayName: 'Install Boost 1.83'
    inputs:
      targetType: inline
-      script: sudo add-apt-repository ppa:mhier/libboost-latest -y
-  - task: Bash@3
-    displayName: 'install boost'
-    inputs:
-      targetType: inline
-      script: sudo apt-get --yes install libboost1.83-dev libboost-system1.83-dev libboost-filesystem1.83-dev
+      script: |
+        sudo add-apt-repository ppa:mhier/libboost-latest -y
+        sudo apt-get --yes install libboost1.83-dev libboost-system1.83-dev libboost-filesystem1.83-dev
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
@@ -94,3 +118,110 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: MIOpen_testing
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - task: Bash@3
+    displayName: 'Install Boost 1.83'
+    inputs:
+      targetType: inline
+      script: |
+        sudo add-apt-repository ppa:mhier/libboost-latest -y
+        sudo apt-get --yes install libboost1.83-dev libboost-system1.83-dev libboost-filesystem1.83-dev
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+# MIOpen depends on a specific version of frugally-deep which is forked here: https://github.com/ROCm/frugally-deep
+# https://github.com/ROCm/frugally-deep/blob/master/INSTALL.md
+  - task: Bash@3
+    displayName: Add Python site-packages binaries to path
+    inputs:
+      targetType: inline
+      script: |
+        USER_BASE=$(python3 -m site --user-base)
+        echo "##vso[task.prependpath]$USER_BASE/bin"
+  - task: Bash@3
+    displayName: Install FunctionalPlus
+    inputs:
+      targetType: inline
+      script: cget install Dobiasd/FunctionalPlus
+  - task: Bash@3
+    displayName: Remove Python site-packages binaries from path
+    inputs:
+      targetType: inline
+      script: |
+        USER_BASE=$(python3 -m site --user-base)
+        echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$USER_BASE/bin;;' -e 's;^/;;' -e 's;/$;;')"
+  - task: Bash@3
+    displayName: git clone frugally-deep
+    inputs:
+      targetType: inline
+      script: git clone https://github.com/ROCm/frugally-deep --depth=1 --shallow-submodules
+      workingDirectory: $(Build.SourcesDirectory)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+      componentName: frugally-deep
+      cmakeBuildDir: $(Build.SourcesDirectory)/frugally-deep/build
+      installDir: $(Build.SourcesDirectory)/bin
+      extraBuildFlags: -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/cget/cget/pkg/Dobiasd__FunctionalPlus/install
+  - task: CMake@1
+    displayName: 'MIOpen Test CMake Flags'
+    inputs:
+      cmakeArgs: >-
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(Build.SourcesDirectory)/bin;$(Build.SourcesDirectory)/cget/cget/pkg/Dobiasd__FunctionalPlus/install
+        -DCMAKE_INSTALL_PREFIX=$(Agent.BuildDirectory)/rocm
+        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
+        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang
+        -DMIOPEN_BACKEND=HIP
+        -DMIOPEN_TEST_FLAGS=" --disable-verification-cache"
+        -DCMAKE_BUILD_TYPE=release
+        -DBUILD_DEV=OFF
+        -DMIOPEN_USE_MLIR=ON
+        -DMIOPEN_GPU_SYNC=OFF
+        ..
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: MIOpen
+      testExecutable: 'CTEST_PARALLEL_LEVEL=4 make -j$(nproc) check'
+      testParameters: ''
+      reloadAMDGPU: true
+      testPublishResults: false
+  - task: Bash@3
+    condition: always()
+    displayName: Clean up Boost 1.83
+    inputs:
+      targetType: inline
+      script: |
+        sudo apt -y autoremove libboost1.83-dev libboost-system1.83-dev libboost-filesystem1.83-dev
+        sudo add-apt-repository --remove ppa:mhier/libboost-latest -y
+        sudo apt update
--- a/.azuredevops/components/hipSOLVER.yml
+++ b/.azuredevops/components/hipSOLVER.yml
@@ -42,6 +42,7 @@ parameters:
    - ROCR-Runtime
    - rocSOLVER
    - rocSPARSE
+    - roctracer

 jobs:
 - job: hipSOLVER
--- a/.azuredevops/components/hipTensor.yml
+++ b/.azuredevops/components/hipTensor.yml
@@ -117,4 +117,4 @@ jobs:
    parameters:
      componentName: hipTensor
      testDir: '$(Agent.BuildDirectory)/rocm/bin/hiptensor'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
+      testParameters: '-E ".*-extended" -VV --output-on-failure --force-new-ctest-process --output-junit test_output.xml'
--- a/.azuredevops/components/rocSOLVER.yml
+++ b/.azuredevops/components/rocSOLVER.yml
@@ -44,6 +44,7 @@ parameters:
    - rocprofiler-register
    - ROCR-Runtime
    - rocSPARSE
+    - roctracer

 jobs:
 - job: rocSOLVER
--- a/.azuredevops/nightly/rocm-nightly.yml
+++ b/.azuredevops/nightly/rocm-nightly.yml
@@ -46,6 +46,7 @@ parameters:
    - rocm_smi_lib
    - rocPRIM
    - rocprofiler-register
+    - rocprofiler-sdk
    - rocprofiler
    - rocPyDecode
    - ROCR-Runtime
--- a/.azuredevops/templates/steps/artifact-download.yml
+++ b/.azuredevops/templates/steps/artifact-download.yml
@@ -64,7 +64,8 @@ parameters:
    rocm_bandwidth_test: master
    rocm_smi_lib: develop
    rocPRIM: develop
-    rocprofiler-register: amd-mainline
+    rocprofiler-register: amd-staging
+    rocprofiler-sdk: amd-staging
    rocprofiler: amd-staging
    rocPyDecode: develop
    ROCR-Runtime: amd-staging
--- a/.azuredevops/templates/steps/dependencies-rocm.yml
+++ b/.azuredevops/templates/steps/dependencies-rocm.yml
@@ -73,6 +73,7 @@ parameters:
    rocm_smi_lib: $(ROCM_SMI_LIB_PIPELINE_ID)
    rocPRIM: $(ROCPRIM_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_PIPELINE_ID)
+    rocprofiler-sdk: $(ROCPROFILER_SDK_PIPELINE_ID)
    rocprofiler: $(ROCPROFILER_PIPELINE_ID)
    rocPyDecode: $(ROCPYDECODE_PIPELINE_ID)
    ROCR-Runtime: $(ROCR_RUNTIME_PIPELINE_ID)
@@ -132,6 +133,7 @@ parameters:
    rocm_smi_lib: $(ROCM_SMI_LIB_TAGGED_PIPELINE_ID)
    rocPRIM: $(ROCPRIM_TAGGED_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID)
+    rocprofiler-sdk: $(ROCPROFILER_SDK_TAGGED_PIPELINE_ID)
    rocprofiler: $(ROCPROFILER_TAGGED_PIPELINE_ID)
    rocPyDecode: $(ROCPYDECODE_TAGGED_PIPELINE_ID)
    ROCR-Runtime: $(ROCR_RUNTIME_TAGGED_PIPELINE_ID)
@@ -178,6 +180,7 @@ parameters:
    - rocFFT
    - rocm-examples
    - rocPRIM
+    - rocprofiler-sdk
    - rocprofiler
    - rocPyDecode
    - rocRAND
--- a/.azuredevops/variables-global.yml
+++ b/.azuredevops/variables-global.yml
@@ -259,6 +259,10 @@ variables:
  value: 1
 - name: ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID
  value: 25
+- name: ROCPROFILER_SDK_PIPELINE_ID
+  value: 246
+- name: ROCPROFILER_SDK_TAGGED_PIPELINE_ID
+  value: 234
 - name: ROCPROFILER_PIPELINE_ID
  value: 143
 - name: ROCPROFILER_TAGGED_PIPELINE_ID
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ 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.2.0
+export ROCM_VERSION=6.2.2 # Or 6.2.0 or 6.2.1
 ~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.2.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml
 ~/bin/repo sync

@@ -199,4 +199,4 @@ cmake --build build --target=doc
 ## Older ROCm releases

 For release information for older ROCm releases, refer to the
-[CHANGELOG](./CHANGELOG.md).
+[ROCm release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.2.1"
+    <default revision="refs/tags/rocm-6.2.2"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
--- a/docs/compatibility/compatibility-matrix.rst
+++ b/docs/compatibility/compatibility-matrix.rst
@@ -10,6 +10,11 @@ Use this matrix to view the ROCm compatibility and system requirements across su

 You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-rocm-compatibility-matrix>`.

+
+.. note::
+
+   AMD Radeon and Radeon Pro GPUs can be used for graphics-related purposes or in headless environments for compute purposes (no graphics components). If you’re not using Radeon or Radeon Pro GPUs in a headless environment, review the `Compatibility matrices <https://rocm.docs.amd.com/projects/radeon/en/latest/docs/compatibility.html>`_ in the Use ROCm on Radeon GPU documentation.
+
 .. |br| raw:: html

   <br/>
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -95,7 +95,7 @@ article_pages = [

 external_toc_path = "./sphinx/_toc.yml"

-extensions = ["rocm_docs", "sphinx_reredirects"]
+extensions = ["sphinx_build_compatibility.extension", "rocm_docs", "sphinx_reredirects"]

 external_projects_current_project = "rocm"

@@ -117,3 +117,8 @@ html_theme_options = {"link_main_doc": False}
 redirects = {"reference/openmp/openmp": "../../about/compatibility/openmp.html"}

 numfig = False
+
+html_js_files = [
+     "readthedocs.js",
+ ]
+
--- a/docs/readthedocs.js
+++ b/docs/readthedocs.js
@@ -0,0 +1,6 @@
+// Trigger the Read the Docs Addons Search modal when clicking on "Search docs" input from the topnav.
+document.querySelector("[role='search'] input").addEventListener("focusin", () => {
+   const event = new CustomEvent("readthedocs-search-show");
+   document.dispatchEvent(event);
+});
+
--- a/docs/sphinx/requirements.in
+++ b/docs/sphinx/requirements.in
@@ -1,2 +1,3 @@
 rocm-docs-core==1.8.1
 sphinx-reredirects
+git+https://github.com/readthedocs/sphinx-build-compatibility#egg=sphinx-build-compatibility
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -92,6 +92,7 @@ requests==2.32.3
    # via
    #   pygithub
    #   sphinx
+    #   sphinx-build-compatibility
 rocm-docs-core==1.8.1
    # via -r requirements.in
 smmap==5.0.1
@@ -107,6 +108,7 @@ sphinx==7.3.7
    #   pydata-sphinx-theme
    #   rocm-docs-core
    #   sphinx-book-theme
+    #   sphinx-build-compatibility
    #   sphinx-copybutton
    #   sphinx-design
    #   sphinx-external-toc
@@ -114,6 +116,8 @@ sphinx==7.3.7
    #   sphinx-reredirects
 sphinx-book-theme==1.1.3
    # via rocm-docs-core
+sphinx-build-compatibility @ git+https://github.com/readthedocs/sphinx-build-compatibility
+    # via -r requirements.in
 sphinx-copybutton==0.5.2
    # via rocm-docs-core
 sphinx-design==0.6.0
--- a/tools/autotag/components.xml
+++ b/tools/autotag/components.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.1.1"
+    <default revision="refs/tags/rocm-6.2.2"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
Author	SHA1	Message	Date
Alex Xu	3389d01ccd	add extension to conf.py	2024-10-16 15:58:36 -04:00
Alex Xu	3e4f196932	add sphinx-build-compatibility extension	2024-10-16 15:57:28 -04:00
Alex Xu	9e2b81edff	remove indentation	2024-10-16 14:53:24 -04:00
Alex Xu	9d28329735	add a trigger for addon search	2024-10-16 14:48:11 -04:00
spolifroni-amd	956d62e621	added revised note re. radeon gpus (#3839 )	2024-10-01 10:02:01 -04:00
Daniel Su	4f04f2dc2e	External CI: filter out hipTensor extended tests (#3838 )	2024-09-30 14:56:36 -04:00
Peter Park	b1d47db155	Point to release history instead of deprecated changelog (#3836 )	2024-09-30 11:07:31 -04:00
Daniel Su	2d86e0ffca	External CI: MIOpen tests (#3837 )	2024-09-30 10:38:27 -04:00
Joseph Macaranas	0c4a7bb77e	External CI: AMDMIGraphX Smoke Tests (#3830 ) Co-authored-by: Daniel Su <danielsu@amd.com>	2024-09-30 09:36:34 -04:00
Daniel Su	ccb8e6269c	External CI: add rocprofiler-sdk pipeline IDs (#3824 )	2024-09-28 03:52:12 -04:00
Daniel Su	c595960b96	External CI: add roctracer to roc/hipSOLVER test deps (#3825 )	2024-09-28 03:50:34 -04:00
Sam Wu	74c7d7d31b	Update tags to 6.2.2 (#3827 )	2024-09-27 14:59:54 -06:00