diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 90f2d871e..48d6228ba 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -10,7 +10,7 @@ updates: open-pull-requests-limit: 10 schedule: interval: "daily" - target-branch: "amd-staging" + target-branch: "dev" labels: - "documentation" - "dependencies" diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9b6e57bdb..e61f66e98 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,6 +4,8 @@ on: push: branches: [ amd-mainline ] paths: + - 'docs/archive/docs-2.x/**' + - 'docs/archive/docs-1.x/**' - 'docs/archive/docs-2.x/**' - 'docs/archive/docs-1.x/**' - '.github/workflows/docs.yml' @@ -36,8 +38,7 @@ jobs: - name: Build 1.x docs run: | cd docs/archive/docs-1.x - cd docs/archive/docs-1.x - make html + make html - name: Build 2.x docs run: | cd docs/archive/docs-2.x diff --git a/docs/conf.py b/docs/conf.py index f74f95ecd..b38ce2e5c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,7 +55,7 @@ # frequently used external resources extlinks = { - "dev-sample": ("https://github.com/ROCm/omniperf/blob/amd-mainline/sample/%s", "%s"), + "dev-sample": ("https://github.com/ROCm/omniperf/blob/dev/sample/%s", "%s"), "prod-page": ( "https://www.amd.com/en/products/accelerators/instinct/%s.html", "%s", diff --git a/docs/how-to/analyze/cli.rst b/docs/how-to/analyze/cli.rst index 82185cd41..f76e3970f 100644 --- a/docs/how-to/analyze/cli.rst +++ b/docs/how-to/analyze/cli.rst @@ -186,7 +186,7 @@ Walkthrough 3. Choose your own customized subset of metrics with the ``-b`` (or ``--block``) option. Or, build your own configuration following - `config_template `_. + `config_template `_. The following snippet shows how to generate a report containing only metric 2 (:doc:`System Speed-of-Light `). diff --git a/docs/how-to/profile/mode.rst b/docs/how-to/profile/mode.rst index 5bc0ad6a7..de23a801b 100644 --- a/docs/how-to/profile/mode.rst +++ b/docs/how-to/profile/mode.rst @@ -38,7 +38,7 @@ Run ``omniperf profile -h`` for more details. See Profiling example ----------------- -The ``__ repository +The ``__ repository includes source code for a sample GPU compute workload, ``vcopy.cpp``. A copy of this file is available in the ``share/sample`` subdirectory after a normal Omniperf installation, or via the ``$OMNIPERF_SHARE/sample`` directory when diff --git a/docs/install/core-install.rst b/docs/install/core-install.rst index f33b97622..1d28b07b5 100644 --- a/docs/install/core-install.rst +++ b/docs/install/core-install.rst @@ -32,7 +32,7 @@ right for you. :width: 800 .. _core-install: - + Core installation ================= @@ -44,12 +44,6 @@ installation. * CMake ``>= 3.19`` * ROCm ``>= 5.7.1`` -.. note:: - - Omniperf will use the first version of ``Python3`` found in your system's - ``PATH``. If the default version of Python3 is older than 3.8, you may need to - update your system's ``PATH`` to point to a newer version of Python3. - Omniperf depends on a number of Python packages documented in the top-level ``requirements.txt`` file. Install these *before* configuring Omniperf. @@ -72,16 +66,6 @@ following steps illustrate how to install the necessary Python dependencies using `pip `_ and Omniperf into a shared location controlled by the ``INSTALL_DIR`` environment variable. -.. tip:: - - To always run Omniperf with a particular version of python, you can create a - bash alias. For example, to run Omniperf with Python 3.10, you can run the - following command: - - .. code-block:: shell - - alias omniperf-mypython="/usr/bin/python3.10 /opt/rocm/bin/omniperf" - .. _core-install-cmake-vars: Configuration variables @@ -142,7 +126,7 @@ Install from source cd build cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}/{{ config.version }} \ -DPYTHON_DEPS=${INSTALL_DIR}/python-libs \ - -DMOD_INSTALL_PATH=${INSTALL_DIR}/modulefiles/omniperf .. + -DMOD_INSTALL_PATH=${INSTALL_DIR}/modulefiles .. # install make install @@ -224,30 +208,21 @@ software stack. .. code-block:: shell $ sudo apt install omniperf - # Include omniperf in your system PATH - $ sudo update-alternatives --install /usr/bin/omniperf omniperf /opt/rocm/bin/omniperf 0 - # Install Python dependencies - $ python3 -m pip install -r /opt/rocm/libexec/omniperf/requirements.txt + $ pip install -r /opt/rocm/libexec/omniperf/requirements.txt .. tab-item:: Red Hat Enterprise Linux .. code-block:: shell $ sudo dnf install omniperf - # Include omniperf in your system PATH - $ sudo update-alternatives --install /usr/bin/omniperf omniperf /opt/rocm/bin/omniperf 0 - # Install Python dependencies - $ python3 -m pip install -r /opt/rocm/libexec/omniperf/requirements.txt + $ pip install -r /opt/rocm/libexec/omniperf/requirements.txt .. tab-item:: SUSE Linux Enterprise Server .. code-block:: shell $ sudo zypper install omniperf - # Include omniperf in your system PATH - $ sudo update-alternatives --install /usr/bin/omniperf omniperf /opt/rocm/bin/omniperf 0 - # Install Python dependencies - $ python3 -m pip install -r /opt/rocm/libexec/omniperf/requirements.txt + $ pip install -r /opt/rocm/libexec/omniperf/requirements.txt .. _core-install-rocprof-var: diff --git a/docs/sphinx/static/css/o_custom.css b/docs/sphinx/static/css/o_custom.css index b4fe010b5..a6cbe5718 100644 --- a/docs/sphinx/static/css/o_custom.css +++ b/docs/sphinx/static/css/o_custom.css @@ -1,8 +1,30 @@ +:root { + --amd-teal-500: #00C2DE; + --amd-teal-750: #00788E; +} + /* Override PyData Sphinx Theme default colors */ html[data-theme='light'] { + --pst-color-primary: var(--amd-teal-750); + --pst-color-primary-bg: var(--amd-teal-500); --pst-color-table-row-hover-bg: #E2E8F0; } html[data-theme='dark'] { + --pst-color-primary: var(--amd-teal-500); + --pst-color-primary-bg: var(--amd-teal-750); --pst-color-table-row-hover-bg: #1E293B; } + +html[data-theme='light'], +html[data-theme='dark'] { + --pst-color-link: var(--pst-color-primary); +} + +a svg { + color: var(--pst-color-text-base); +} + +a svg:hover { + color: var(--pst-color-link-hover); +} diff --git a/docs/tutorial/includes/infinity-fabric-transactions.rst b/docs/tutorial/includes/infinity-fabric-transactions.rst index fd510bd49..b60355bf7 100644 --- a/docs/tutorial/includes/infinity-fabric-transactions.rst +++ b/docs/tutorial/includes/infinity-fabric-transactions.rst @@ -410,7 +410,7 @@ Experiment 5: Coarse-grained, CPU-DRAM reads ---------------------------------------------- In our next fabric experiment, we change our CPU memory allocation to be -:ref:`coarse-grained `. We accomplish this by passing the +`coarse-grained `__. We accomplish this by passing the ``hipHostMalloc`` API the ``hipHostMallocNonCoherent`` flag, to mark the allocation as coarse-grained: diff --git a/docs/tutorial/includes/occupancy-limiters-example.rst b/docs/tutorial/includes/occupancy-limiters-example.rst index bd8129d12..324254533 100644 --- a/docs/tutorial/includes/occupancy-limiters-example.rst +++ b/docs/tutorial/includes/occupancy-limiters-example.rst @@ -303,7 +303,7 @@ SGPR limited ------------ Finally, we modify our kernel once more to make it limited by -:ref:`SGPRs `: +`SGPRs `__: .. code-block:: cpp diff --git a/docs/tutorial/includes/vector-memory-operation-counting.rst b/docs/tutorial/includes/vector-memory-operation-counting.rst index 2797ed8f2..e3dd0deb4 100644 --- a/docs/tutorial/includes/vector-memory-operation-counting.rst +++ b/docs/tutorial/includes/vector-memory-operation-counting.rst @@ -623,7 +623,7 @@ manner. See for further reading on this instruction type. We develop a `simple -kernel `__ +kernel `__ that uses stack memory: .. code-block:: cpp diff --git a/docs/tutorial/profiling-by-example.rst b/docs/tutorial/profiling-by-example.rst index e39239b9d..8a9c85c03 100644 --- a/docs/tutorial/profiling-by-example.rst +++ b/docs/tutorial/profiling-by-example.rst @@ -7,7 +7,7 @@ Profiling by example ******************** The following examples refer to sample :doc:`HIP ` code located in -:fab:`github` :dev-sample:`ROCm/omniperf/blob/amd-mainline/sample <>` and distributed +:fab:`github` :dev-sample:`ROCm/omniperf/blob/dev/sample <>` and distributed as part of Omniperf. .. include:: ./includes/valu-arithmetic-instruction-mix.rst