Skip to content

Commit 71e9c70

Browse files
dgaliffiAMDdgaliffiAMD
committed
Merge branch 'amd-staging' into amd-mainline
2 parents 7838aa2 + 9f5458f commit 71e9c70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+986
-231
lines changed

‎.azuredevops/rocm-ci.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
resources:
2+
repositories:
3+
- repository: pipelines_repo
4+
type: github
5+
endpoint: ROCm
6+
name: ROCm/ROCm
7+
8+
variables:
9+
- group: common
10+
- template: /.azuredevops/variables-global.yml@pipelines_repo
11+
12+
trigger:
13+
batch: true
14+
branches:
15+
include:
16+
- amd-staging
17+
- amd-mainline
18+
paths:
19+
exclude:
20+
- .github
21+
- docs
22+
- '.*.y*ml'
23+
- '*.md'
24+
- LICENSE
25+
- VERSION
26+
27+
pr:
28+
autoCancel: true
29+
branches:
30+
include:
31+
- amd-staging
32+
- amd-mainline
33+
paths:
34+
exclude:
35+
- .github
36+
- docs
37+
- '.*.y*ml'
38+
- '*.md'
39+
- LICENSE
40+
- VERSION
41+
drafts: false
42+
43+
jobs:
44+
- template: ${{ variables.CI_COMPONENT_PATH }}/omnitrace.yml@pipelines_repo

‎.github/dependabot.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "" # See documentation for possible values
9-
directory: "/" # Location of package manifests
10-
schedule:
11-
interval: "weekly"
12-
138
- package-ecosystem: "pip" # See documentation for possible values
149
directory: "/docs/sphinx" # Location of package manifests
1510
open-pull-requests-limit: 10

‎.github/workflows/containers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
schedule:
88
- cron: 0 5 * * *
99
push:
10-
branches: [main, amd-mainline]
10+
branches: [amd-staging]
1111
paths:
1212
- '.github/workflows/containers.yml'
1313
- 'docker/**'

‎.github/workflows/cpack.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-name: cpack
44
on:
55
workflow_dispatch:
66
push:
7-
branches: [main, amd-mainline, release/**]
7+
branches: [amd-staging, amd-mainline, release/**]
88
tags:
99
- "v[1-9].[0-9]+.[0-9]+*"
1010
- "rocm-[1-9].[0-9]+.[0-9]+*"
@@ -13,7 +13,7 @@ on:
1313
- 'docs/**'
1414
- 'source/docs/**'
1515
pull_request:
16-
branches: [main, amd-mainline]
16+
branches: [amd-staging]
1717
paths:
1818
- '.github/workflows/cpack.yml'
1919
- 'docker/**'

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: Documentation
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [main, amd-mainline, gh-pages]
6+
branches: [amd-staging, amd-mainline, gh-pages]
77
paths:
88
- '*.md'
99
- 'source/docs/**'
1010
- '.github/workflows/docs.yml'
1111
- 'VERSION'
1212
pull_request:
13-
branches: [main, amd-mainline]
13+
branches: [amd-staging, amd-mainline]
1414
paths:
1515
- '*.md'
1616
- 'source/docs/**'

‎.github/workflows/formatting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ run-name: formatting
44

55
on:
66
push:
7-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
7+
branches: [ amd-mainline, amd-staging, release/** ]
88
pull_request:
9-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
9+
branches: [ amd-mainline, amd-staging, release/** ]
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/opensuse.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: opensuse-15
33

44
on:
55
push:
6-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
6+
branches: [ amd-mainline, amd-staging, release/** ]
77
paths-ignore:
88
- '*.md'
99
- 'docs/**'
@@ -15,7 +15,7 @@ on:
1515
- '.github/workflows/formatting.yml'
1616
- 'docker/**'
1717
pull_request:
18-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
18+
branches: [ amd-mainline, amd-staging, release/** ]
1919
paths-ignore:
2020
- '*.md'
2121
- 'docs/**'
@@ -61,9 +61,9 @@ jobs:
6161
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
6262
chmod +x /opt/trace_processor/bin/trace_processor_shell
6363
python3 -m pip install --upgrade pip &&
64-
python3 -m pip install numpy perfetto dataclasses &&
65-
python3 -m pip install 'cmake==3.21.4' &&
66-
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done
64+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
65+
python3 -m pip install 'cmake==3.18.4' &&
66+
for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done
6767
6868
- name: Configure Env
6969
run:

‎.github/workflows/redhat.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: redhat
33

44
on:
55
push:
6-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
6+
branches: [ amd-mainline, amd-staging, release/** ]
77
paths-ignore:
88
- '*.md'
99
- 'docs/**'
@@ -15,7 +15,7 @@ on:
1515
- '.github/workflows/formatting.yml'
1616
- 'docker/**'
1717
pull_request:
18-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
18+
branches: [ amd-mainline, amd-staging, release/** ]
1919
paths-ignore:
2020
- '*.md'
2121
- 'docs/**'
@@ -72,10 +72,12 @@ jobs:
7272
run: |
7373
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
7474
chmod +x /opt/trace_processor/bin/trace_processor_shell
75+
yum install -y epel-release && yum install -y 'dnf-command(config-manager)' && crb enable && \
76+
yum install -y curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel &&
7577
python3 -m pip install --upgrade pip &&
76-
python3 -m pip install numpy perfetto dataclasses &&
77-
python3 -m pip install 'cmake==3.21.4' &&
78-
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done
78+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
79+
python3 -m pip install 'cmake==3.18.4' &&
80+
for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done
7981
8082
- name: Install ROCm Packages
8183
if: ${{ matrix.rocm-version > 0 }}

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ on:
44
workflow_dispatch:
55
push:
66
tags:
7-
- v*
7+
- "v[1-9].[0-9]+.[0-9]+*"
8+
- "rocm-[1-9].[0-9]+.[0-9]+*"
89

910
concurrency:
1011
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/ubuntu-focal.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: ubuntu-focal
33

44
on:
55
push:
6-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
6+
branches: [ amd-mainline, amd-staging, release/** ]
77
paths-ignore:
88
- '*.md'
99
- 'docs/**'
@@ -15,7 +15,7 @@ on:
1515
- '.github/workflows/formatting.yml'
1616
- 'docker/**'
1717
pull_request:
18-
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
18+
branches: [ amd-mainline, amd-staging, release/** ]
1919
paths-ignore:
2020
- '*.md'
2121
- 'docs/**'
@@ -93,13 +93,13 @@ jobs:
9393
add-apt-repository -y ppa:ubuntu-toolchain-r/test &&
9494
apt-get update &&
9595
apt-get upgrade -y &&
96-
apt-get install -y build-essential m4 autoconf libtool python3-pip libiberty-dev clang libmpich-dev mpich environment-modules ${{ matrix.compiler }} &&
96+
apt-get install -y autoconf bison build-essential clang environment-modules libiberty-dev libmpich-dev libtool m4 mpich python3-pip texinfo ${{ matrix.compiler }} &&
9797
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
9898
chmod +x /opt/trace_processor/bin/trace_processor_shell &&
9999
python3 -m pip install --upgrade pip &&
100-
python3 -m pip install numpy perfetto dataclasses &&
101-
python3 -m pip install 'cmake==3.16.3' &&
102-
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
100+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
101+
python3 -m pip install 'cmake==3.18.4' &&
102+
for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done &&
103103
apt-get -y --purge autoremove &&
104104
apt-get -y clean &&
105105
/opt/conda/bin/conda clean -y -a
@@ -275,13 +275,13 @@ jobs:
275275
wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - &&
276276
echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${{ matrix.rocm-version }}/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list &&
277277
apt-get update &&
278-
apt-get install -y build-essential m4 autoconf libtool python3-pip clang libomp-dev ${{ matrix.compiler }} libudev1 libnuma1 rocm-dev rocm-utils rocm-smi-lib roctracer-dev rocprofiler-dev rccl-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev libpapi-dev curl libopenmpi-dev openmpi-bin libfabric-dev &&
278+
apt-get install -y autoconf bison build-essential clang curl hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev libfabric-dev libnuma1 libomp-dev libopenmpi-dev libpapi-dev libtool libudev1 m4 openmpi-bin python3-pip rccl-dev rocm-dev rocm-smi-lib rocm-utils rocprofiler-dev roctracer-dev texinfo ${{ matrix.compiler }} &&
279279
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
280280
chmod +x /opt/trace_processor/bin/trace_processor_shell &&
281281
python3 -m pip install --upgrade pip &&
282-
python3 -m pip install numpy perfetto dataclasses &&
283-
python3 -m pip install 'cmake==3.21.4' &&
284-
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
282+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
283+
python3 -m pip install 'cmake==3.18.4' &&
284+
for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done &&
285285
apt-get -y --purge autoremove &&
286286
apt-get -y clean &&
287287
/opt/conda/bin/conda clean -y -a
@@ -436,14 +436,14 @@ jobs:
436436
max_attempts: 5
437437
command: |
438438
sudo apt-get update &&
439-
sudo apt-get install -y build-essential m4 autoconf libtool python3-pip clang libomp-dev environment-modules ${{ matrix.deps }} ${{ matrix.compiler }} &&
439+
sudo apt-get install -y autoconf bison build-essential clang environment-modules gettext libomp-dev libtool m4 python3-pip texinfo ${{ matrix.compiler }} ${{ matrix.deps }} &&
440440
if [ "${{ matrix.mpi }}" = "mpich" ]; then sudo apt-get install -y libmpich-dev mpich; fi &&
441441
if [ "${{ matrix.mpi }}" = "openmpi" ]; then sudo apt-get install -y libopenmpi-dev openmpi-bin libfabric-dev; fi &&
442442
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
443443
chmod +x /opt/trace_processor/bin/trace_processor_shell &&
444444
python3 -m pip install --upgrade pip &&
445-
python3 -m pip install numpy perfetto dataclasses &&
446-
python3 -m pip install 'cmake==3.16.3' &&
445+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
446+
python3 -m pip install 'cmake==3.18.4' &&
447447
sudo apt-get -y --purge autoremove &&
448448
sudo apt-get -y clean
449449
@@ -591,13 +591,13 @@ jobs:
591591
max_attempts: 5
592592
command: |
593593
apt-get update &&
594-
apt-get install -y build-essential m4 autoconf libtool python3-pip clang libomp-dev environment-modules gcc g++ mpich libmpich-dev texinfo &&
594+
apt-get install -y autoconf bison build-essential clang environment-modules gcc g++ libmpich-dev libomp-dev libtool m4 mpich python3-pip texinfo &&
595595
wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin &&
596596
chmod +x /opt/trace_processor/bin/trace_processor_shell &&
597597
python3 -m pip install --upgrade pip &&
598-
python3 -m pip install numpy perfetto dataclasses &&
599-
python3 -m pip install 'cmake==3.24.1' &&
600-
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
598+
python3 -m pip install --upgrade numpy perfetto dataclasses &&
599+
python3 -m pip install 'cmake==3.18.4' &&
600+
for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done &&
601601
apt-get -y --purge autoremove &&
602602
apt-get -y clean &&
603603
/opt/conda/bin/conda clean -y -a

0 commit comments

Comments
 (0)