Skip to content

Commit

Permalink
Merge branch 'main' into pytest-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrmadsen
jrmadsen authored Oct 16, 2023
2 parents d75a29e + 6a61a83 commit 4992b21
Show file tree
Hide file tree
Showing 24 changed files with 222 additions and 129 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
24 changes: 24 additions & 0 deletions .github/workflows/containers.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ jobs:
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.5"
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.6"
# ubuntu 22.04
- os-distro: "ubuntu"
os-version: "22.04"
Expand All @@ -140,6 +143,9 @@ jobs:
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.5"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.6"
# opensuse 15.3
- os-distro: "opensuse"
os-version: "15.3"
Expand Down Expand Up @@ -187,6 +193,9 @@ jobs:
- os-distro: "opensuse"
os-version: "15.4"
rocm-version: "5.5"
- os-distro: "opensuse"
os-version: "15.4"
rocm-version: "5.6"
# RHEL 8.7
- os-distro: "rhel"
os-version: "8.7"
Expand All @@ -197,6 +206,12 @@ jobs:
- os-distro: "rhel"
os-version: "8.7"
rocm-version: "5.4"
- os-distro: "rhel"
os-version: "8.7"
rocm-version: "5.5"
- os-distro: "rhel"
os-version: "8.7"
rocm-version: "5.6"
# RHEL 9.0
- os-distro: "rhel"
os-version: "9.0"
Expand All @@ -207,6 +222,9 @@ jobs:
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "5.4"
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "5.5"
# RHEL 9.1
- os-distro: "rhel"
os-version: "9.1"
Expand All @@ -217,6 +235,12 @@ jobs:
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.4"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.5"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.6"


steps:
Expand Down
191 changes: 99 additions & 92 deletions .github/workflows/cpack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,47 +35,38 @@ jobs:
- os-distro: "ubuntu"
os-version: "18.04"
rocm-version: "0.0"
- os-distro: "ubuntu"
os-version: "18.04"
rocm-version: "4.5"
- os-distro: "ubuntu"
os-version: "18.04"
rocm-version: "5.0"
- os-distro: "ubuntu"
os-version: "18.04"
rocm-version: "5.1"
- os-distro: "ubuntu"
os-version: "18.04"
rocm-version: "5.2"
# ubuntu 20.04
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "0.0"
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.2"
rocm-version: "5.4"
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.3"
rocm-version: "5.5"
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.4"
rocm-version: "5.6"
- os-distro: "ubuntu"
os-version: "20.04"
rocm-version: "5.5"
rocm-version: "5.7"
# ubuntu 22.04
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "0.0"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.3"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.4"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.5"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.6"
- os-distro: "ubuntu"
os-version: "22.04"
rocm-version: "5.7"
# opensuse 15.3
- os-distro: "opensuse"
os-version: "15.3"
Expand Down Expand Up @@ -108,6 +99,12 @@ jobs:
- os-distro: "opensuse"
os-version: "15.4"
rocm-version: "5.5"
- os-distro: "opensuse"
os-version: "15.4"
rocm-version: "5.6"
- os-distro: "opensuse"
os-version: "15.4"
rocm-version: "5.7"
# RHEL 8.7
- os-distro: "rhel"
os-version: "8.7"
Expand All @@ -121,34 +118,40 @@ jobs:
- os-distro: "rhel"
os-version: "8.7"
rocm-version: "5.5"
# RHEL 9.0
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "0.0"
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "5.3"
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "5.4"
os-version: "8.7"
rocm-version: "5.6"
- os-distro: "rhel"
os-version: "9.0"
rocm-version: "5.5"
os-version: "8.7"
rocm-version: "5.7"
# RHEL 9.1
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "0.0"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.3"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.4"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.5"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.6"
- os-distro: "rhel"
os-version: "9.1"
rocm-version: "5.7"

steps:
- name: Free Disk Space
uses: jlumbroso/[email protected]
with:
tool-cache: false
android: true
dotnet: true
haskell: true
large-packages: false
swap-storage: false

- uses: actions/checkout@v3
with:
submodules: recursive
Expand All @@ -163,20 +166,24 @@ jobs:
run: |
echo "CI_SCRIPT_ARGS=--rocm +python" >> $GITHUB_ENV
- name: Configure Ubuntu Generators
if: ${{ matrix.os-distro == 'ubuntu' }}
- name: Configure Generators
run: |
echo "CI_GENERATOR_ARGS=--generators STGZ DEB" >> $GITHUB_ENV
echo "CI_GENERATOR_ARGS=--generators STGZ" >> $GITHUB_ENV
- name: Configure OpenSUSE Generators
if: ${{ matrix.os-distro == 'opensuse' }}
run: |
echo "CI_GENERATOR_ARGS=--generators STGZ RPM" >> $GITHUB_ENV
# - name: Configure Ubuntu Generators
# if: ${{ matrix.os-distro == 'ubuntu' }}
# run: |
# echo "CI_GENERATOR_ARGS=--generators STGZ DEB" >> $GITHUB_ENV

- name: Configure RedHat Generators
if: ${{ matrix.os-distro == 'rhel' }}
run: |
echo "CI_GENERATOR_ARGS=--generators STGZ" >> $GITHUB_ENV
# - name: Configure OpenSUSE Generators
# if: ${{ matrix.os-distro == 'opensuse' }}
# run: |
# echo "CI_GENERATOR_ARGS=--generators STGZ RPM" >> $GITHUB_ENV

# - name: Configure RedHat Generators
# if: ${{ matrix.os-distro == 'rhel' }}
# run: |
# echo "CI_GENERATOR_ARGS=--generators STGZ" >> $GITHUB_ENV

- name: Build Base Container
timeout-minutes: 30
Expand Down Expand Up @@ -205,23 +212,23 @@ jobs:
path: |
build-release/stgz/*.sh
- name: DEB Artifacts
timeout-minutes: 10
if: ${{ matrix.os-distro == 'ubuntu' }}
uses: actions/upload-artifact@v3
with:
name: omnitrace-deb-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer
path: |
build-release/deb/*.deb
# - name: DEB Artifacts
# timeout-minutes: 10
# if: ${{ matrix.os-distro == 'ubuntu' }}
# uses: actions/upload-artifact@v3
# with:
# name: omnitrace-deb-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer
# path: |
# build-release/deb/*.deb

- name: RPM Artifacts
timeout-minutes: 10
if: ${{ matrix.os-distro == 'opensuse' }}
uses: actions/upload-artifact@v3
with:
name: omnitrace-rpm-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer
path: |
build-release/rpm/*.rpm
# - name: RPM Artifacts
# timeout-minutes: 10
# if: ${{ matrix.os-distro == 'opensuse' }}
# uses: actions/upload-artifact@v3
# with:
# name: omnitrace-rpm-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer
# path: |
# build-release/rpm/*.rpm

# before testing remove any artifacts of the build
- name: Remove Build
Expand Down Expand Up @@ -249,38 +256,38 @@ jobs:
files: |
omnitrace-*.sh
- name: Test DEB Install
timeout-minutes: 20
if: ${{ matrix.os-distro == 'ubuntu' }}
run: |
set -v
for i in omnitrace_*.deb
do
./docker/test-docker-release.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --deb ${i}
done
# - name: Test DEB Install
# timeout-minutes: 20
# if: ${{ matrix.os-distro == 'ubuntu' }}
# run: |
# set -v
# for i in omnitrace_*.deb
# do
# ./docker/test-docker-release.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --deb ${i}
# done

- name: Upload DEB Release Assets
uses: softprops/action-gh-release@v1
if: matrix.os-distro == 'ubuntu' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace'
with:
fail_on_unmatched_files: True
files: |
omnitrace_*.deb
# - name: Upload DEB Release Assets
# uses: softprops/action-gh-release@v1
# if: matrix.os-distro == 'ubuntu' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace'
# with:
# fail_on_unmatched_files: True
# files: |
# omnitrace_*.deb

- name: Test RPM Install
timeout-minutes: 20
if: ${{ matrix.os-distro == 'opensuse' }}
run: |
set -v
for i in omnitrace-*.rpm
do
./docker/test-docker-release.sh --distro opensuse --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --rpm ${i}
done
# - name: Test RPM Install
# timeout-minutes: 20
# if: ${{ matrix.os-distro == 'opensuse' }}
# run: |
# set -v
# for i in omnitrace-*.rpm
# do
# ./docker/test-docker-release.sh --distro opensuse --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --rpm ${i}
# done

- name: Upload RPM Release Assets
uses: softprops/action-gh-release@v1
if: matrix.os-distro == 'opensuse' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace'
with:
fail_on_unmatched_files: True
files: |
omnitrace-*.rpm
# - name: Upload RPM Release Assets
# uses: softprops/action-gh-release@v1
# if: matrix.os-distro == 'opensuse' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace'
# with:
# fail_on_unmatched_files: True
# files: |
# omnitrace-*.rpm
11 changes: 10 additions & 1 deletion .github/workflows/redhat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ jobs:
os-release: [ '8.7', '9.0', '9.1' ]
rocm-version: [ '0.0', '5.3', '5.4' ]
build-type: ['Release']
include:
- compiler: 'g++'
os-release: '9.1'
rocm-version: '5.5'
build-type: 'Release'
- compiler: 'g++'
os-release: '9.1'
rocm-version: '5.6'
build-type: 'Release'

steps:
- uses: actions/checkout@v3
Expand All @@ -60,7 +69,7 @@ jobs:
if [ "${OS_VERSION_MAJOR}" -eq 8 ]; then PERL_REPO=powertools; else PERL_REPO=crb; fi && \
dnf -y --enablerepo=${PERL_REPO} install perl-File-BaseDir
yum install -y https://repo.radeon.com/amdgpu-install/${{ matrix.rocm-version }}/rhel/${{ matrix.os-release }}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1${RPM_TAG}.noarch.rpm
yum install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev
yum install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev libpciaccess
- name: Configure, Build, and Test
timeout-minutes: 115
Expand Down
Loading

0 comments on commit 4992b21

Please sign in to comment.