From dc1f01dae9e514dba8bf7df89775c5b38f57190c Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:13:30 -0500 Subject: [PATCH 1/7] Runners Update --- .../workflows/rocprofiler-sdk-continuous_integration.yml | 2 +- .github/workflows/rocprofiler-sdk-docs.yml | 2 +- .github/workflows/rocprofiler-sdk-formatting.yml | 6 +++--- .github/workflows/rocprofiler-sdk-python.yml | 2 +- .github/workflows/rocprofiler-sdk-restrictions.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index 145519d31c..5e759f4d8e 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -197,7 +197,7 @@ jobs: build-type: ['RelWithDebInfo'] ci-flags: [''] - runs-on: rocprof-${{ matrix.os }} + runs-on: rocprofiler-${{ matrix.os }} # define this for containers env: diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index 7c066307bc..2d8b7dc513 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -72,7 +72,7 @@ jobs: deploy-docs: if: github.ref == 'refs/heads/amd-mainline' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build-docs permissions: contents: read diff --git a/.github/workflows/rocprofiler-sdk-formatting.yml b/.github/workflows/rocprofiler-sdk-formatting.yml index 7892280a83..5dcd528fb7 100644 --- a/.github/workflows/rocprofiler-sdk-formatting.yml +++ b/.github/workflows/rocprofiler-sdk-formatting.yml @@ -18,7 +18,7 @@ concurrency: jobs: cmake: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -91,7 +91,7 @@ jobs: fi python: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.10'] @@ -133,7 +133,7 @@ jobs: fi missing-new-line: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rocprofiler-sdk-python.yml b/.github/workflows/rocprofiler-sdk-python.yml index 8f1d23b779..30eaef1623 100644 --- a/.github/workflows/rocprofiler-sdk-python.yml +++ b/.github/workflows/rocprofiler-sdk-python.yml @@ -15,7 +15,7 @@ concurrency: jobs: linting: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.8', '3.10', '3.12'] diff --git a/.github/workflows/rocprofiler-sdk-restrictions.yml b/.github/workflows/rocprofiler-sdk-restrictions.yml index b47fc20f31..ae6e02ec32 100644 --- a/.github/workflows/rocprofiler-sdk-restrictions.yml +++ b/.github/workflows/rocprofiler-sdk-restrictions.yml @@ -28,7 +28,7 @@ concurrency: jobs: regex: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: FOLDERS: "projects/rocprofiler-sdk/source/lib/common projects/rocprofiler-sdk/source/lib/rocprofiler-sdk projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-roctx" From 66e7e42d0ca254ff65f95f146e58e9f732033de6 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:31:25 -0500 Subject: [PATCH 2/7] Fixing ROCProfiler SDK Docs workflow --- .github/workflows/rocprofiler-sdk-docs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index 2d8b7dc513..effd2b6ed6 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -39,7 +39,6 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: projects/rocprofiler-sdk - submodules: true - name: Setup Pages uses: actions/configure-pages@v5 - name: Create Docs Directory @@ -103,7 +102,6 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: projects/rocprofiler-sdk - submodules: true - name: Create Docs Directory run: | git config --global --add safe.directory '*' From de9a19a4c532375a1b3a8897cbfb9f6fbb4a29d2 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:34:54 -0500 Subject: [PATCH 3/7] Fixing ROCProfiler SDK Docs workflow --- .github/workflows/rocprofiler-sdk-docs.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index effd2b6ed6..d95b287311 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -39,8 +39,6 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: projects/rocprofiler-sdk - - name: Setup Pages - uses: actions/configure-pages@v5 - name: Create Docs Directory run: | git config --global --add safe.directory '*' @@ -63,11 +61,6 @@ jobs: python3 -m pip install doxysphinx rocm-docs-core git config --global --add safe.directory '*' ../scripts/update-docs.sh - - name: Upload artifact - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: actions/upload-pages-artifact@v3 - with: - path: projects/rocprofiler-sdk/docs deploy-docs: if: github.ref == 'refs/heads/amd-mainline' @@ -115,7 +108,7 @@ jobs: git config --global --add safe.directory '*' sudo apt-get update sudo apt-get install -y cmake gcc g++ libdw-dev libsqlite3-dev rpm - python3 -m pip install -r requirements.txt + python3 -m pip install -r projects/rocprofiler-sdk/requirements.txt - name: Configure, Build, Install, and Package timeout-minutes: 60 @@ -131,7 +124,7 @@ jobs: -DCPACK_GENERATOR='DEB;RPM;TGZ' -DCPACK_PACKAGING_INSTALL_PREFIX="$(realpath /opt/rocm)" -DPython3_EXECUTABLE=$(which python3) - .; + projects/rocprofiler-sdk; cmake --build build --target docs --parallel 4; cmake --build build --target all --parallel 12; sudo cmake --build build --target install --parallel 12; From 7501280c6b5afc3a266f8e1deec824308e764618 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:39:24 -0500 Subject: [PATCH 4/7] Fixing ROCProfiler SDK Docs workflow --- .github/workflows/rocprofiler-sdk-docs.yml | 26 +++++----------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index d95b287311..6fade10f89 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -62,22 +62,6 @@ jobs: git config --global --add safe.directory '*' ../scripts/update-docs.sh - deploy-docs: - if: github.ref == 'refs/heads/amd-mainline' - runs-on: ubuntu-22.04 - needs: build-docs - permissions: - contents: read - pages: write - id-token: write - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 - build-docs-from-source: runs-on: ubuntu-latest container: rocm/dev-ubuntu-22.04:latest @@ -96,10 +80,12 @@ jobs: with: sparse-checkout: projects/rocprofiler-sdk - name: Create Docs Directory + shell: bash + working-directory: projects/rocprofiler-sdk/ run: | git config --global --add safe.directory '*' - mkdir -p projects/rocprofiler-sdk/source/docs/_doxygen/rocprofiler-sdk - mkdir -p projects/rocprofiler-sdk/source/docs/_doxygen/roctx + mkdir -p source/docs/_doxygen/rocprofiler-sdk + mkdir -p source/docs/_doxygen/roctx - name: Install requirements timeout-minutes: 10 shell: bash @@ -108,7 +94,7 @@ jobs: git config --global --add safe.directory '*' sudo apt-get update sudo apt-get install -y cmake gcc g++ libdw-dev libsqlite3-dev rpm - python3 -m pip install -r projects/rocprofiler-sdk/requirements.txt + python3 -m pip install -r requirements.txt - name: Configure, Build, Install, and Package timeout-minutes: 60 @@ -124,7 +110,7 @@ jobs: -DCPACK_GENERATOR='DEB;RPM;TGZ' -DCPACK_PACKAGING_INSTALL_PREFIX="$(realpath /opt/rocm)" -DPython3_EXECUTABLE=$(which python3) - projects/rocprofiler-sdk; + .; cmake --build build --target docs --parallel 4; cmake --build build --target all --parallel 12; sudo cmake --build build --target install --parallel 12; From 8465cf5c143ab69dd4bdb5dcfac6e38ef3c6eb46 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:46:56 -0500 Subject: [PATCH 5/7] Fixing ROCProfiler SDK Docs workflow --- .github/workflows/rocprofiler-sdk-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index 6fade10f89..ce71bf5a1e 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -79,6 +79,8 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: projects/rocprofiler-sdk + submodules: 'recursive' + set-safe-directory: true - name: Create Docs Directory shell: bash working-directory: projects/rocprofiler-sdk/ @@ -91,7 +93,6 @@ jobs: shell: bash working-directory: projects/rocprofiler-sdk/ run: | - git config --global --add safe.directory '*' sudo apt-get update sudo apt-get install -y cmake gcc g++ libdw-dev libsqlite3-dev rpm python3 -m pip install -r requirements.txt @@ -101,7 +102,6 @@ jobs: shell: bash working-directory: projects/rocprofiler-sdk/ run: - git config --global --add safe.directory '*'; export CMAKE_PREFIX_PATH=/opt/rocm:${CMAKE_PREFIX_PATH}; cmake -B build -DROCPROFILER_DEP_ROCMCORE=ON From b279076eabf2acce6b55e120788c3b82f0d7ba5c Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:50:07 -0500 Subject: [PATCH 6/7] Fixing ROCProfiler SDK Docs workflow --- .github/workflows/rocprofiler-sdk-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index ce71bf5a1e..c934f39071 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -79,7 +79,6 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: projects/rocprofiler-sdk - submodules: 'recursive' set-safe-directory: true - name: Create Docs Directory shell: bash @@ -103,6 +102,7 @@ jobs: working-directory: projects/rocprofiler-sdk/ run: export CMAKE_PREFIX_PATH=/opt/rocm:${CMAKE_PREFIX_PATH}; + git submodule update --init --recursive; cmake -B build -DROCPROFILER_DEP_ROCMCORE=ON -DROCPROFILER_BUILD_DOCS=ON From 46c09872535b186e1b6ff74b1a5ec637619ceef1 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 31 Jul 2025 13:55:54 -0500 Subject: [PATCH 7/7] Fixing ROCProfiler SDK workflows --- .../rocprofiler-sdk-continuous_integration.yml | 18 +++++++++++++++--- .github/workflows/rocprofiler-sdk-docs.yml | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index 5e759f4d8e..e0338ff620 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -65,7 +65,11 @@ jobs: CORE_EXT_RUNNER: mi3xx steps: - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 + with: + sparse-checkout: projects/rocprofiler-sdk + set-safe-directory: true - name: Install requirements timeout-minutes: 10 @@ -205,7 +209,11 @@ jobs: OS_TYPE: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 + with: + sparse-checkout: projects/rocprofiler-sdk + set-safe-directory: true - name: Install requirements timeout-minutes: 10 @@ -282,7 +290,11 @@ jobs: GCC_COMPILER_VERSION: 13 steps: - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 + with: + sparse-checkout: projects/rocprofiler-sdk + set-safe-directory: true - name: Install requirements timeout-minutes: 10 diff --git a/.github/workflows/rocprofiler-sdk-docs.yml b/.github/workflows/rocprofiler-sdk-docs.yml index c934f39071..5508941209 100644 --- a/.github/workflows/rocprofiler-sdk-docs.yml +++ b/.github/workflows/rocprofiler-sdk-docs.yml @@ -102,7 +102,7 @@ jobs: working-directory: projects/rocprofiler-sdk/ run: export CMAKE_PREFIX_PATH=/opt/rocm:${CMAKE_PREFIX_PATH}; - git submodule update --init --recursive; + git submodule update --init -- .; cmake -B build -DROCPROFILER_DEP_ROCMCORE=ON -DROCPROFILER_BUILD_DOCS=ON