Run pre-commit's whitespace related hooks on .github and .azuredevops (#2129)

In order for pre-commit to be useful, everything needs to meet a common
baseline.

Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
This commit is contained in:
Mario Limonciello
2025-12-08 14:39:42 -06:00
gecommit door GitHub
bovenliggende 354cc98d55
commit 6a899b5f6d
11 gewijzigde bestanden met toevoegingen van 59 en 59 verwijderingen
+13 -13
Bestand weergeven
@@ -1,5 +1,5 @@
trigger: none trigger: none
pr: pr:
branches: branches:
include: include:
- develop - develop
@@ -10,11 +10,11 @@ pr:
variables: variables:
- group: internal - group: internal
- name: REPOSITORY_NAME - name: REPOSITORY_NAME
value: '$(Build.Repository.Name)' value: '$(Build.Repository.Name)'
- name: HEAD_SHA - name: HEAD_SHA
value: '$(system.pullRequest.sourceCommitId)' value: '$(system.pullRequest.sourceCommitId)'
- name: PR_NUM - name: PR_NUM
value: '$(system.pullRequest.pullRequestNumber)' value: '$(system.pullRequest.pullRequestNumber)'
- name: PR_URL - name: PR_URL
value: '$(system.pullRequest.sourceRepositoryUri)/pull/$(PR_NUM)' value: '$(system.pullRequest.sourceRepositoryUri)/pull/$(PR_NUM)'
- name: BASE_REF - name: BASE_REF
@@ -22,9 +22,9 @@ variables:
- name: EVENT_TYPE - name: EVENT_TYPE
value: 'pull_request' value: 'pull_request'
- name: GH_PAT - name: GH_PAT
value: '$(svc_acc_org_secret)' value: '$(svc_acc_org_secret)'
jobs: jobs:
- job: Determine_Changes - job: Determine_Changes
displayName: 'Sparse Checkout & Check Changed Files' displayName: 'Sparse Checkout & Check Changed Files'
pool: rocm-ci-caller pool: rocm-ci-caller
@@ -45,7 +45,7 @@ jobs:
git fetch --depth=250 origin $(HEAD_SHA) git fetch --depth=250 origin $(HEAD_SHA)
git checkout FETCH_HEAD git checkout FETCH_HEAD
git diff --name-only origin/$(BASE_REF)...HEAD > ../changed_files.txt git diff --name-only origin/$(BASE_REF)...HEAD > ../changed_files.txt
echo "Changed files:" echo "Changed files:"
@@ -81,7 +81,7 @@ jobs:
name: detectChanges name: detectChanges
displayName: Detect path changes displayName: Detect path changes
- job: Trigger_Pipeline - job: Trigger_Pipeline
displayName: 'Trigger Pipeline or Skip' displayName: 'Trigger Pipeline or Skip'
dependsOn: Determine_Changes dependsOn: Determine_Changes
condition: succeeded() condition: succeeded()
@@ -91,7 +91,7 @@ jobs:
windows_skip: $[ dependencies.Determine_Changes.outputs['detectChanges.windows_skip'] ] windows_skip: $[ dependencies.Determine_Changes.outputs['detectChanges.windows_skip'] ]
steps: steps:
- checkout: none - checkout: none
- script: | - script: |
echo "DEBUG: match_found = '$(match_found)'" echo "DEBUG: match_found = '$(match_found)'"
displayName: 'Debug match_found variable' displayName: 'Debug match_found variable'
@@ -110,7 +110,7 @@ jobs:
-f description="Windows PSDB skipped" -f description="Windows PSDB skipped"
displayName: 'Skip WindowsCI - Internal' displayName: 'Skip WindowsCI - Internal'
condition: eq(variables.windows_skip, 'true') condition: eq(variables.windows_skip, 'true')
- script: | - script: |
rm -rf $(repo_name) rm -rf $(repo_name)
git clone $(gh_repo) git clone $(gh_repo)
@@ -118,7 +118,7 @@ jobs:
condition: eq(variables.match_found, 'true') condition: eq(variables.match_found, 'true')
- script: | - script: |
set -e set -e
echo "Calling jenkins_api.py for PR #$(PR_NUM)" echo "Calling jenkins_api.py for PR #$(PR_NUM)"
cd $(repo_name) cd $(repo_name)
docker run \ docker run \
@@ -139,8 +139,8 @@ jobs:
-ghpat '$(GH_PAT)' \ -ghpat '$(GH_PAT)' \
-br '$(BASE_REF)' \ -br '$(BASE_REF)' \
-et '$(EVENT_TYPE)'" > /dev/null 2>&1 -et '$(EVENT_TYPE)'" > /dev/null 2>&1
displayName: Invoke jenkins_api.py in Docker displayName: Invoke jenkins_api.py in Docker
env: env:
svc_acc_org_secret: $(svc_acc_org_secret) svc_acc_org_secret: $(svc_acc_org_secret)
condition: eq(variables.match_found, 'true') condition: eq(variables.match_found, 'true')
+1 -1
Bestand weergeven
@@ -1,7 +1,7 @@
"project: amdsmi": "project: amdsmi":
- changed-files: - changed-files:
- any-glob-to-any-file: 'projects/amdsmi/**/*' - any-glob-to-any-file: 'projects/amdsmi/**/*'
"project: aqlprofile": "project: aqlprofile":
- changed-files: - changed-files:
- any-glob-to-any-file: 'projects/aqlprofile/**/*' - any-glob-to-any-file: 'projects/aqlprofile/**/*'
@@ -12,60 +12,60 @@ class ConfigureCITest(unittest.TestCase):
"is_pull_request": True, "is_pull_request": True,
"input_subtrees": "projects/rocprim\nprojects/hipcub" "input_subtrees": "projects/rocprim\nprojects/hipcub"
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertEqual(len(project_to_run), 1) self.assertEqual(len(project_to_run), 1)
def test_pull_request_empty(self): def test_pull_request_empty(self):
args = { args = {
"is_pull_request": True, "is_pull_request": True,
"input_subtrees": "" "input_subtrees": ""
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertEqual(len(project_to_run), 0) self.assertEqual(len(project_to_run), 0)
def test_workflow_dispatch(self): def test_workflow_dispatch(self):
args = { args = {
"is_workflow_dispatch": True, "is_workflow_dispatch": True,
"input_projects": "projects/rocprim projects/hipcub" "input_projects": "projects/rocprim projects/hipcub"
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertEqual(len(project_to_run), 1) self.assertEqual(len(project_to_run), 1)
def test_workflow_dispatch_bad_input(self): def test_workflow_dispatch_bad_input(self):
args = { args = {
"is_workflow_dispatch": True, "is_workflow_dispatch": True,
"input_projects": "projects/rocprim$$projects/hipcub" "input_projects": "projects/rocprim$$projects/hipcub"
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertEqual(len(project_to_run), 0) self.assertEqual(len(project_to_run), 0)
def test_workflow_dispatch_all(self): def test_workflow_dispatch_all(self):
args = { args = {
"is_workflow_dispatch": True, "is_workflow_dispatch": True,
"input_projects": "all" "input_projects": "all"
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertGreaterEqual(len(project_to_run), 1) self.assertGreaterEqual(len(project_to_run), 1)
def test_workflow_dispatch_empty(self): def test_workflow_dispatch_empty(self):
args = { args = {
"is_workflow_dispatch": True, "is_workflow_dispatch": True,
"input_projects": "" "input_projects": ""
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertEqual(len(project_to_run), 0) self.assertEqual(len(project_to_run), 0)
def test_is_push(self): def test_is_push(self):
args = { args = {
"is_push": True, "is_push": True,
} }
project_to_run = therock_configure_ci.retrieve_projects(args) project_to_run = therock_configure_ci.retrieve_projects(args)
self.assertGreaterEqual(len(project_to_run), 1) self.assertGreaterEqual(len(project_to_run), 1)
@@ -30,7 +30,7 @@ def set_github_output(d: Mapping[str, str]):
return return
with open(step_output_file, "a") as f: with open(step_output_file, "a") as f:
f.writelines(f"{k}={v}" + "\n" for k, v in d.items()) f.writelines(f"{k}={v}" + "\n" for k, v in d.items())
def retry(max_attempts, delay_seconds, exceptions): def retry(max_attempts, delay_seconds, exceptions):
def decorator(func): def decorator(func):
def newfn(*args, **kwargs): def newfn(*args, **kwargs):
@@ -111,7 +111,7 @@ def retrieve_projects(args):
# retrieve the subtrees to checkout, cmake options to build, and projects to test # retrieve the subtrees to checkout, cmake options to build, and projects to test
project_to_run = [] project_to_run = []
# Currently as we have no tests, we just build all packages available if an applicable change is made. # Currently as we have no tests, we just build all packages available if an applicable change is made.
# As we start to get an idea of test times, we can divide test jobs. # As we start to get an idea of test times, we can divide test jobs.
if projects: if projects:
for project in ["all"]: for project in ["all"]:
+15 -15
Bestand weergeven
@@ -2,21 +2,21 @@
This dictionary is used to map specific file directory changes to the corresponding build flag and tests This dictionary is used to map specific file directory changes to the corresponding build flag and tests
""" """
subtree_to_project_map = { subtree_to_project_map = {
'projects/aqlprofile': 'profiler', 'projects/aqlprofile': 'profiler',
'projects/clr': 'core', 'projects/clr': 'core',
'projects/hip': 'core', 'projects/hip': 'core',
'projects/hip-tests': 'core', 'projects/hip-tests': 'core',
'projects/hipother': 'core', 'projects/hipother': 'core',
'projects/rdc': 'rdc', 'projects/rdc': 'rdc',
'projects/rocm-core': 'core', 'projects/rocm-core': 'core',
'projects/rocm-smi-lib': 'core', 'projects/rocm-smi-lib': 'core',
'projects/rocminfo': 'core', 'projects/rocminfo': 'core',
'projects/rocprofiler-compute': 'profiler', 'projects/rocprofiler-compute': 'profiler',
'projects/rocprofiler-register': 'profiler', 'projects/rocprofiler-register': 'profiler',
'projects/rocprofiler-sdk': 'profiler', 'projects/rocprofiler-sdk': 'profiler',
'projects/rocprofiler-systems': 'profiler', 'projects/rocprofiler-systems': 'profiler',
'projects/rocprofiler': 'profiler', 'projects/rocprofiler': 'profiler',
'projects/rocr-runtime': 'core', 'projects/rocr-runtime': 'core',
'projects/roctracer': 'profiler' 'projects/roctracer': 'profiler'
} }
@@ -52,7 +52,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
system: system: |
- { gpu: 'navi4', runner: 'rocprofiler-navi4-dind', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx120X' } - { gpu: 'navi4', runner: 'rocprofiler-navi4-dind', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx120X' }
- { gpu: 'navi3', runner: 'rocprofiler-navi3-dind', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx110X' } - { gpu: 'navi3', runner: 'rocprofiler-navi3-dind', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx110X' }
- { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' } - { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'ubuntu-22.04', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' }
@@ -132,7 +132,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
system: system:
- { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'rhel-8.8', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' } - { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'rhel-8.8', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' }
- { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'rhel-9.5', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' } - { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'rhel-9.5', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' }
- { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'sles-15.6', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' } - { gpu: 'mi325', runner: 'linux-mi325-1gpu-ossci-rocm', os: 'sles-15.6', build-type: 'RelWithDebInfo', gpu-target: 'gfx94X' }
@@ -200,7 +200,7 @@ jobs:
PATH=~/.local/bin:${{ env.ROCM_PATH }}/bin:${PATH} PATH=~/.local/bin:${{ env.ROCM_PATH }}/bin:${PATH}
LD_LIBRARY_PATH=$(pwd)/build:${{ env.ROCM_PATH }}/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$(pwd)/build:${{ env.ROCM_PATH }}/lib:$LD_LIBRARY_PATH
ctest --output-on-failure -DCTEST_SOURCE_DIRECTORY="$(pwd)" ctest --output-on-failure -DCTEST_SOURCE_DIRECTORY="$(pwd)"
-DCTEST_BINARY_DIRECTORY="$(pwd)/build" -DAQLPROFILE_BUILD_NUM_JOBS="16" -DCTEST_BINARY_DIRECTORY="$(pwd)/build" -DAQLPROFILE_BUILD_NUM_JOBS="16"
-DCTEST_SITE=${{ matrix.system.runner }} -DCTEST_SITE=${{ matrix.system.runner }}
-DCTEST_BUILD_NAME=PR_${{ github.ref_name }}_${{ github.repository }}-${{ matrix.system.os }}-${{ matrix.system.gpu }}-core -DCTEST_BUILD_NAME=PR_${{ github.ref_name }}_${{ github.repository }}-${{ matrix.system.os }}-${{ matrix.system.gpu }}-core
-DCMAKE_CTEST_ARGUMENTS="" -DCMAKE_CTEST_ARGUMENTS=""
+3 -3
Bestand weergeven
@@ -45,17 +45,17 @@ jobs:
.github/scripts/import_subrepo_prs.py .github/scripts/import_subrepo_prs.py
${{ github.event.inputs.subrepo-prefix }} ${{ github.event.inputs.subrepo-prefix }}
sparse-checkout-cone-mode: true sparse-checkout-cone-mode: true
- name: Set up Python 3.x - name: Set up Python 3.x
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: "3.x" python-version: "3.x"
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install PyGithub GitPython pip install PyGithub GitPython
- name: Import Subrepo PRs - name: Import Subrepo PRs
env: env:
GITHUB_TOKEN: ${{ steps.gen_token.outputs.token }} GITHUB_TOKEN: ${{ steps.gen_token.outputs.token }}
@@ -26,11 +26,11 @@ jobs:
id: generate_matrix id: generate_matrix
run: | run: |
MATRIX='[{"os-release":"22.04","gpu":"mi355","arch":"gfx950","runner":"linux-mi355-1gpu-ossci-rocm","code-name":"jammy"},{"os-release":"24.04","gpu":"mi355","arch":"gfx950","runner":"linux-mi355-1gpu-ossci-rocm","code-name":"noble"},{"os-release":"22.04","gpu":"mi325","arch":"gfx94X","runner":"linux-mi325-1gpu-ossci-rocm","code-name":"jammy"},{"os-release":"24.04","gpu":"mi325","arch":"gfx94X","runner":"linux-mi325-1gpu-ossci-rocm","code-name":"noble"}]' MATRIX='[{"os-release":"22.04","gpu":"mi355","arch":"gfx950","runner":"linux-mi355-1gpu-ossci-rocm","code-name":"jammy"},{"os-release":"24.04","gpu":"mi355","arch":"gfx950","runner":"linux-mi355-1gpu-ossci-rocm","code-name":"noble"},{"os-release":"22.04","gpu":"mi325","arch":"gfx94X","runner":"linux-mi325-1gpu-ossci-rocm","code-name":"jammy"},{"os-release":"24.04","gpu":"mi325","arch":"gfx94X","runner":"linux-mi325-1gpu-ossci-rocm","code-name":"noble"}]'
if [ -n "${{ github.event.inputs.runner_matrix }}" ]; then if [ -n "${{ github.event.inputs.runner_matrix }}" ]; then
MATRIX='${{ github.event.inputs.runner_matrix }}' MATRIX='${{ github.event.inputs.runner_matrix }}'
fi fi
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
coverage: coverage:
@@ -49,14 +49,14 @@ jobs:
packages: read packages: read
container: container:
image: ghcr.io/rocm/rocprofiler-ubuntu:${{ matrix.system.os-release }}-systems-ci-${{ matrix.system.arch }} image: ghcr.io/rocm/rocprofiler-ubuntu:${{ matrix.system.os-release }}-systems-ci-${{ matrix.system.arch }}
options: options:
--privileged --privileged
--ipc host --ipc host
--group-add video --group-add video
--device /dev/kfd --device /dev/kfd
--device /dev/dri --device /dev/dri
--cap-add CAP_SYS_ADMIN --cap-add CAP_SYS_ADMIN
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
with: with:
@@ -71,7 +71,7 @@ jobs:
# Older ROCm versions don't provide these packages. # Older ROCm versions don't provide these packages.
apt install -y rccl-dev rccl-unittests || true apt install -y rccl-dev rccl-unittests || true
apt install -y rocjpeg-dev rocjpeg-test rocdecode-dev rocdecode-test || true apt install -y rocjpeg-dev rocjpeg-test rocdecode-dev rocdecode-test || true
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 10 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 10 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 20 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 20 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
python3 -m pip install -U --user -r requirements.txt python3 -m pip install -U --user -r requirements.txt
@@ -79,7 +79,7 @@ jobs:
DOCKER_FILE=Dockerfile.${{ matrix.system.distro }}.ci DOCKER_FILE=Dockerfile.${{ matrix.system.distro }}.ci
fi fi
echo "docker_file=${DOCKER_FILE}" >> $GITHUB_OUTPUT echo "docker_file=${DOCKER_FILE}" >> $GITHUB_OUTPUT
- name: Get the latest build of The Rock tarball - name: Get the latest build of The Rock tarball
id: therock id: therock
run: | run: |
@@ -95,7 +95,7 @@ jobs:
KEY=${KEY//\"/} KEY=${KEY//\"/}
test -n "$KEY" || { echo "No ${{ matrix.gpu }} tarball found"; exit 1; } test -n "$KEY" || { echo "No ${{ matrix.gpu }} tarball found"; exit 1; }
echo "tarball=${KEY}" >> $GITHUB_OUTPUT echo "tarball=${KEY}" >> $GITHUB_OUTPUT
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.7.9 uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.7.9
+1 -1
Bestand weergeven
@@ -54,7 +54,7 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pydantic requests pip install pydantic requests
- name: Detect changed subtrees - name: Detect changed subtrees
id: detect id: detect
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'