Docker and build-release script updates [skip ci] (#61)

- Update CPack [ROCm/rocprofiler-systems commit: 9cba1f80ba]
2022-05-19 16:06:38 -05:00
@@ -1,7 +1,7 @@
 name: cancel-builds-on-update
 on:
  workflow_run:
-    workflows: ['formatting', 'ubuntu-bionic', 'ubuntu-focal-external-rocm', 'ubuntu-focal-external', 'ubuntu-focal', 'cpack-bionic', 'cpack-bionic-rocm', 'cpack-focal', cpack-focal-rocm']
+    workflows: ['formatting', 'ubuntu-bionic', 'ubuntu-focal-external-rocm', 'ubuntu-focal-external', 'ubuntu-focal', 'cpack-ubuntu', 'cpack-opensuse']
    types: ['requested']

 jobs:
@@ -1,196 +0,0 @@
-name: cpack-bionic-rocm
-
-on:
-  push:
-    branches: [releases/**]
-  pull_request:
-    branches: [releases/**]
-
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  CORE_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCMAKE_INSTALL_PREFIX=/opt/omnitrace
-  OMNITRACE_CMAKE_ARGS: -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_BUILD_TESTING=OFF -DOMNITRACE_USE_MPI_HEADERS=ON -DOMNITRACE_USE_HIP=ON -DOMNITRACE_USE_OMPT=ON -DOMNITRACE_USE_PAPI=ON -DOMNITRACE_BUILD_PAPI=ON
-  TIMEMORY_CMAKE_ARGS: -DTIMEMORY_USE_LIBUNWIND=ON -DTIMEMORY_BUILD_LIBUNWIND=ON -DTIMEMORY_BUILD_PORTABLE=ON
-  DYNINST_CMAKE_ARGS: -DOMNITRACE_BUILD_DYNINST=ON -DDYNINST_BUILD_TBB=ON -DDYNINST_BUILD_BOOST=ON -DDYNINST_BUILD_ELFUTILS=ON -DDYNINST_BUILD_LIBIBERTY=ON -DDYNINST_USE_OpenMP=ON
-  DEBIAN_FRONTEND: noninteractive
-  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-
-jobs:
-  cpack:
-    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [18.04]
-        rocm-latest: [5.0]
-        rocm-version: [4.5, 5.0]
-        extensions: [""]
-
-    steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install System Packages
-        timeout-minutes: 20
-        run: |
-          set -v
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev openmpi-bin rpm librpm-dev
-          python3 -m pip install 'cmake==3.18.4'
-
-      - name: Install HIP Packages
-        if: ${{ matrix.rocm-version != matrix.rocm-latest }}
-        timeout-minutes: 20
-        run: |
-          set -v
-          wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
-          echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${{ matrix.rocm-version }}/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y rocm-dev rocm-utils roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev rocm-smi-lib
-
-      - name: Install HIP Packages
-        if: ${{ matrix.rocm-version == matrix.rocm-latest }}
-        timeout-minutes: 20
-        run: |
-          set -v
-          wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
-          echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y rocm-dev rocm-utils roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev rocm-smi-lib
-
-      - name: Configure Env
-        run: |
-          export OMNITRACE_VERSION=$(cat VERSION)
-          export OMNITRACE_DISTRO=$(lsb_release -i | awk '{print $NF}')-$(lsb_release -r | awk '{print $NF}')
-          echo "OMNITRACE_VERSION=${OMNITRACE_VERSION}" >> $GITHUB_ENV
-          echo "OMNITRACE_DISTRO=${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "COMMON_CMAKE_ARGS=${CORE_CMAKE_ARGS} ${OMNITRACE_CMAKE_ARGS} ${TIMEMORY_CMAKE_ARGS} ${DYNINST_CMAKE_ARGS}" >> $GITHUB_ENV
-          echo "PACKAGE_BASE_TAG=omnitrace-${OMNITRACE_VERSION}-${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "PATH=${HOME}/.local/bin:${PATH}" >> $GITHUB_ENV
-
-      - name: Print Env
-        run: |
-          env
-
-      # HIP without extensions
-      - name: Configure Package
-        if: ${{ matrix.extensions == '' }}
-        timeout-minutes: 10
-        run: |
-          set -v
-          cmake -B build-release ${COMMON_CMAKE_ARGS} .
-
-      # Build
-      - name: Build Package
-        timeout-minutes: 45
-        run: |
-          set -v
-          cmake --build build-release --target all
-
-      # Generate STGZ
-      - name: Generate STGZ
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G STGZ
-
-      # Generate DEB
-      - name: Generate DEB
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/omnitrace
-
-      - name: List Files
-        timeout-minutes: 10
-        run: |
-          find . -type f | egrep '\.(sh|deb|rpm)$'
-
-      - name: STGZ Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-bionic-rocm-stgz-installers
-          path: |
-            build-release/omnitrace-*.sh
-
-      - name: DEB Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-bionic-rocm-deb-installers
-          path: |
-            build-release/omnitrace_*.deb
-
-      # before testing remove any artifacts of the build
-      - name: Remove Build and Install
-        timeout-minutes: 10
-        run: |
-          mv build-release/omnitrace-*.sh ./
-          mv build-release/omnitrace_*.deb ./
-          rm -rf build-release
-          rm -rf /opt/omnitrace
-
-      - name: STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          mkdir /opt/omnitrace-stgz
-          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
-
-      - name: List STGZ Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace-stgz
-
-      - name: Test STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace-stgz/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
-
-      - name: DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          dpkg --contents ./omnitrace_*.deb
-          dpkg -i ./omnitrace_*.deb
-
-      - name: List DEB Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace
-
-      - name: Test DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
@@ -1,172 +0,0 @@
-name: cpack-bionic
-
-on:
-  push:
-    branches: [releases/**]
-  pull_request:
-    branches: [releases/**]
-
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  CORE_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCMAKE_INSTALL_PREFIX=/opt/omnitrace
-  OMNITRACE_CMAKE_ARGS: -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_BUILD_TESTING=OFF -DOMNITRACE_USE_MPI_HEADERS=ON -DOMNITRACE_USE_HIP=OFF -DOMNITRACE_USE_OMPT=ON -DOMNITRACE_USE_PAPI=ON -DOMNITRACE_BUILD_PAPI=ON
-  TIMEMORY_CMAKE_ARGS: -DTIMEMORY_USE_LIBUNWIND=ON -DTIMEMORY_BUILD_LIBUNWIND=ON -DTIMEMORY_BUILD_PORTABLE=ON
-  DYNINST_CMAKE_ARGS: -DOMNITRACE_BUILD_DYNINST=ON -DDYNINST_BUILD_TBB=ON -DDYNINST_BUILD_BOOST=ON -DDYNINST_BUILD_ELFUTILS=ON -DDYNINST_BUILD_LIBIBERTY=ON -DDYNINST_USE_OpenMP=ON
-  DEBIAN_FRONTEND: noninteractive
-  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-
-jobs:
-  cpack:
-    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [18.04]
-        extensions: [""]
-
-    steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install System Packages
-        timeout-minutes: 20
-        run: |
-          set -v
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev openmpi-bin rpm librpm-dev
-          python3 -m pip install 'cmake==3.18.4'
-
-      - name: Configure Env
-        run: |
-          export OMNITRACE_VERSION=$(cat VERSION)
-          export OMNITRACE_DISTRO=$(lsb_release -i | awk '{print $NF}')-$(lsb_release -r | awk '{print $NF}')
-          echo "OMNITRACE_VERSION=${OMNITRACE_VERSION}" >> $GITHUB_ENV
-          echo "OMNITRACE_DISTRO=${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "COMMON_CMAKE_ARGS=${CORE_CMAKE_ARGS} ${OMNITRACE_CMAKE_ARGS} ${TIMEMORY_CMAKE_ARGS} ${DYNINST_CMAKE_ARGS}" >> $GITHUB_ENV
-          echo "PACKAGE_BASE_TAG=omnitrace-${OMNITRACE_VERSION}-${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "PATH=${HOME}/.local/bin:${PATH}" >> $GITHUB_ENV
-
-      - name: Print Env
-        run: |
-          env
-
-      # CORE without extensions
-      - name: Configure Package
-        if: ${{ matrix.extensions == '' }}
-        timeout-minutes: 10
-        run: |
-          set -v
-          cmake -B build-release ${COMMON_CMAKE_ARGS} .
-
-      # Build
-      - name: Build Package
-        timeout-minutes: 45
-        run: |
-          set -v
-          cmake --build build-release --target all
-
-      # Generate STGZ
-      - name: Generate STGZ
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G STGZ
-
-      # Generate DEB
-      - name: Generate DEB
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/omnitrace
-
-      - name: List Files
-        timeout-minutes: 10
-        run: |
-          find . -type f | egrep '\.(sh|deb|rpm)$'
-
-      - name: STGZ Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-bionic-stgz-installers
-          path: |
-            build-release/omnitrace-*.sh
-
-      - name: DEB Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-bionic-deb-installers
-          path: |
-            build-release/omnitrace_*.deb
-
-      # before testing remove any artifacts of the build
-      - name: Remove Build and Install
-        timeout-minutes: 10
-        run: |
-          mv build-release/omnitrace-*.sh ./
-          mv build-release/omnitrace_*.deb ./
-          rm -rf build-release
-          rm -rf /opt/omnitrace
-
-      - name: STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          mkdir /opt/omnitrace-stgz
-          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
-
-      - name: List STGZ Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace-stgz
-
-      - name: Test STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace-stgz/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
-
-      - name: DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          dpkg --contents ./omnitrace_*.deb
-          dpkg -i ./omnitrace_*.deb
-
-      - name: List DEB Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace
-
-      - name: Test DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
@@ -1,196 +0,0 @@
-name: cpack-focal-rocm
-
-on:
-  push:
-    branches: [releases/**]
-  pull_request:
-    branches: [releases/**]
-
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  CORE_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCMAKE_INSTALL_PREFIX=/opt/omnitrace
-  OMNITRACE_CMAKE_ARGS: -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_BUILD_TESTING=OFF -DOMNITRACE_USE_MPI_HEADERS=ON -DOMNITRACE_USE_HIP=ON -DOMNITRACE_USE_OMPT=ON -DOMNITRACE_USE_PAPI=ON -DOMNITRACE_BUILD_PAPI=ON
-  TIMEMORY_CMAKE_ARGS: -DTIMEMORY_USE_LIBUNWIND=ON -DTIMEMORY_BUILD_LIBUNWIND=ON -DTIMEMORY_BUILD_PORTABLE=ON
-  DYNINST_CMAKE_ARGS: -DOMNITRACE_BUILD_DYNINST=ON -DDYNINST_BUILD_TBB=ON -DDYNINST_BUILD_BOOST=ON -DDYNINST_BUILD_ELFUTILS=ON -DDYNINST_BUILD_LIBIBERTY=ON -DDYNINST_USE_OpenMP=ON
-  DEBIAN_FRONTEND: noninteractive
-  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-
-jobs:
-  cpack:
-    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [20.04]
-        rocm-latest: [5.0]
-        rocm-version: [4.5, 5.0]
-        extensions: [""]
-
-    steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install System Packages
-        timeout-minutes: 20
-        run: |
-          set -v
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev openmpi-bin rpm librpm-dev
-          python3 -m pip install 'cmake==3.18.4'
-
-      - name: Install HIP Packages
-        if: ${{ matrix.rocm-version != matrix.rocm-latest }}
-        timeout-minutes: 20
-        run: |
-          set -v
-          wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
-          echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${{ matrix.rocm-version }}/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y rocm-dev rocm-utils roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev rocm-smi-lib
-
-      - name: Install HIP Packages
-        if: ${{ matrix.rocm-version == matrix.rocm-latest }}
-        timeout-minutes: 20
-        run: |
-          set -v
-          wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
-          echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y rocm-dev rocm-utils roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev rocm-smi-lib
-
-      - name: Configure Env
-        run: |
-          export OMNITRACE_VERSION=$(cat VERSION)
-          export OMNITRACE_DISTRO=$(lsb_release -i | awk '{print $NF}')-$(lsb_release -r | awk '{print $NF}')
-          echo "OMNITRACE_VERSION=${OMNITRACE_VERSION}" >> $GITHUB_ENV
-          echo "OMNITRACE_DISTRO=${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "COMMON_CMAKE_ARGS=${CORE_CMAKE_ARGS} ${OMNITRACE_CMAKE_ARGS} ${TIMEMORY_CMAKE_ARGS} ${DYNINST_CMAKE_ARGS}" >> $GITHUB_ENV
-          echo "PACKAGE_BASE_TAG=omnitrace-${OMNITRACE_VERSION}-${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "PATH=${HOME}/.local/bin:${PATH}" >> $GITHUB_ENV
-
-      - name: Print Env
-        run: |
-          env
-
-      # HIP without extensions
-      - name: Configure Package
-        if: ${{ matrix.extensions == '' }}
-        timeout-minutes: 10
-        run: |
-          set -v
-          cmake -B build-release ${COMMON_CMAKE_ARGS} .
-
-      # Build
-      - name: Build Package
-        timeout-minutes: 45
-        run: |
-          set -v
-          cmake --build build-release --target all
-
-      # Generate STGZ
-      - name: Generate STGZ
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G STGZ
-
-      # Generate DEB
-      - name: Generate DEB
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/omnitrace
-
-      - name: List Files
-        timeout-minutes: 10
-        run: |
-          find . -type f | egrep '\.(sh|deb|rpm)$'
-
-      - name: STGZ Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-focal-rocm-stgz-installers
-          path: |
-            build-release/omnitrace-*.sh
-
-      - name: DEB Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-focal-rocm-deb-installers
-          path: |
-            build-release/omnitrace_*.deb
-
-      # before testing remove any artifacts of the build
-      - name: Remove Build and Install
-        timeout-minutes: 10
-        run: |
-          mv build-release/omnitrace-*.sh ./
-          mv build-release/omnitrace_*.deb ./
-          rm -rf build-release
-          rm -rf /opt/omnitrace
-
-      - name: STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          mkdir /opt/omnitrace-stgz
-          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
-
-      - name: List STGZ Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace-stgz
-
-      - name: Test STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace-stgz/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
-
-      - name: DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          dpkg --contents ./omnitrace_*.deb
-          dpkg -i ./omnitrace_*.deb
-
-      - name: List DEB Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace
-
-      - name: Test DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
@@ -1,172 +0,0 @@
-name: cpack-focal
-
-on:
-  push:
-    branches: [releases/**]
-  pull_request:
-    branches: [releases/**]
-
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  CORE_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCMAKE_INSTALL_PREFIX=/opt/omnitrace
-  OMNITRACE_CMAKE_ARGS: -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_BUILD_TESTING=OFF -DOMNITRACE_USE_MPI_HEADERS=ON -DOMNITRACE_USE_HIP=OFF -DOMNITRACE_USE_OMPT=ON -DOMNITRACE_USE_PAPI=ON -DOMNITRACE_BUILD_PAPI=ON
-  TIMEMORY_CMAKE_ARGS: -DTIMEMORY_USE_LIBUNWIND=ON -DTIMEMORY_BUILD_LIBUNWIND=ON -DTIMEMORY_BUILD_PORTABLE=ON
-  DYNINST_CMAKE_ARGS: -DOMNITRACE_BUILD_DYNINST=ON -DDYNINST_BUILD_TBB=ON -DDYNINST_BUILD_BOOST=ON -DDYNINST_BUILD_ELFUTILS=ON -DDYNINST_BUILD_LIBIBERTY=ON -DDYNINST_USE_OpenMP=ON
-  DEBIAN_FRONTEND: noninteractive
-  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-
-jobs:
-  cpack:
-    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [20.04]
-        extensions: [""]
-
-    steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install System Packages
-        timeout-minutes: 20
-        run: |
-          set -v
-          apt-get update
-          apt-get dist-upgrade -y
-          apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev openmpi-bin rpm librpm-dev
-          python3 -m pip install 'cmake==3.18.4'
-
-      - name: Configure Env
-        run: |
-          export OMNITRACE_VERSION=$(cat VERSION)
-          export OMNITRACE_DISTRO=$(lsb_release -i | awk '{print $NF}')-$(lsb_release -r | awk '{print $NF}')
-          echo "OMNITRACE_VERSION=${OMNITRACE_VERSION}" >> $GITHUB_ENV
-          echo "OMNITRACE_DISTRO=${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "COMMON_CMAKE_ARGS=${CORE_CMAKE_ARGS} ${OMNITRACE_CMAKE_ARGS} ${TIMEMORY_CMAKE_ARGS} ${DYNINST_CMAKE_ARGS}" >> $GITHUB_ENV
-          echo "PACKAGE_BASE_TAG=omnitrace-${OMNITRACE_VERSION}-${OMNITRACE_DISTRO}" >> $GITHUB_ENV
-          echo "PATH=${HOME}/.local/bin:${PATH}" >> $GITHUB_ENV
-
-      - name: Print Env
-        run: |
-          env
-
-      # CORE without extensions
-      - name: Configure Package
-        if: ${{ matrix.extensions == '' }}
-        timeout-minutes: 10
-        run: |
-          set -v
-          cmake -B build-release ${COMMON_CMAKE_ARGS} .
-
-      # Build
-      - name: Build Package
-        timeout-minutes: 45
-        run: |
-          set -v
-          cmake --build build-release --target all
-
-      # Generate STGZ
-      - name: Generate STGZ
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G STGZ
-
-      # Generate DEB
-      - name: Generate DEB
-        timeout-minutes: 45
-        run: |
-          set -v
-          cd build-release
-          cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/omnitrace
-
-      - name: List Files
-        timeout-minutes: 10
-        run: |
-          find . -type f | egrep '\.(sh|deb|rpm)$'
-
-      - name: STGZ Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-focal-stgz-installers
-          path: |
-            build-release/omnitrace-*.sh
-
-      - name: DEB Artifacts
-        timeout-minutes: 10
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-focal-deb-installers
-          path: |
-            build-release/omnitrace_*.deb
-
-      # before testing remove any artifacts of the build
-      - name: Remove Build and Install
-        timeout-minutes: 10
-        run: |
-          mv build-release/omnitrace-*.sh ./
-          mv build-release/omnitrace_*.deb ./
-          rm -rf build-release
-          rm -rf /opt/omnitrace
-
-      - name: STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          mkdir /opt/omnitrace-stgz
-          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
-
-      - name: List STGZ Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace-stgz
-
-      - name: Test STGZ Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace-stgz/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
-
-      - name: DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          dpkg --contents ./omnitrace_*.deb
-          dpkg -i ./omnitrace_*.deb
-
-      - name: List DEB Install
-        timeout-minutes: 10
-        continue-on-error: true
-        run: |
-          find /opt/omnitrace
-
-      - name: Test DEB Install
-        timeout-minutes: 10
-        run: |
-          set -v
-          export PATH=/opt/omnitrace/bin:${PATH}
-          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
-          omnitrace-avail --help
-          omnitrace --help
-          omnitrace-critical-trace --help
@@ -0,0 +1,124 @@
+name: cpack-opensuse
+
+on:
+  push:
+    branches: [releases/**]
+  pull_request:
+    branches: [releases/**]
+
+env:
+  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
+
+jobs:
+  cpack:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [15.2, 15.3]
+        rocm-version: [4.5, 5.0, 5.1]
+        extensions: ["--rocm +python", "--core +python"]
+
+    steps:
+      - name: Patch Git
+        timeout-minutes: 5
+        run: |
+          apt-get update
+          apt-get install -y software-properties-common
+          add-apt-repository -y ppa:git-core/ppa
+          apt-get update
+          apt-get upgrade -y
+          apt-get install -y git
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Build Base Container
+        timeout-minutes: 20
+        run: |
+          pushd docker
+          ./build-docker.sh --distro opensuse --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }}
+          popd
+
+      - name: Build Release
+        timeout-minutes: 20
+        run: |
+          pushd docker
+          ./build-docker-release.sh --distro opensuse --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }} -- ${{ matrix.extensions }}
+          popd
+
+      - name: List Files
+        timeout-minutes: 10
+        run: |
+          find . -type f | egrep '\.(sh|deb|rpm)$'
+
+      - name: STGZ Artifacts
+        timeout-minutes: 10
+        uses: actions/upload-artifact@v2
+        with:
+          name: opensuse-stgz-installers
+          path: |
+            build-release/stgz/omnitrace-*.sh
+
+      - name: DEB Artifacts
+        timeout-minutes: 10
+        uses: actions/upload-artifact@v2
+        with:
+          name: opensuse-deb-installers
+          path: |
+            build-release/deb/omnitrace_*.deb
+
+      # before testing remove any artifacts of the build
+      - name: Remove Build and Install
+        timeout-minutes: 10
+        run: |
+          mv build-release/stgz/omnitrace-*.sh ./
+          mv build-release/deb/omnitrace_*.deb ./
+          rm -rf build-release
+          rm -rf /opt/omnitrace
+
+      - name: STGZ Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          mkdir /opt/omnitrace-stgz
+          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
+
+      - name: List STGZ Install
+        timeout-minutes: 10
+        continue-on-error: true
+        run: |
+          find /opt/omnitrace-stgz
+
+      - name: Test STGZ Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          export PATH=/opt/omnitrace-stgz/bin:${PATH}
+          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
+          omnitrace-avail --help
+          omnitrace --help
+          omnitrace-critical-trace --help
+
+      - name: DEB Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          dpkg --contents ./omnitrace_*.deb
+          dpkg -i ./omnitrace_*.deb
+
+      - name: List DEB Install
+        timeout-minutes: 10
+        continue-on-error: true
+        run: |
+          find /opt/omnitrace
+
+      - name: Test DEB Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          export PATH=/opt/omnitrace/bin:${PATH}
+          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
+          omnitrace-avail --help
+          omnitrace --help
@@ -0,0 +1,124 @@
+name: cpack-ubuntu
+
+on:
+  push:
+    branches: [releases/**]
+  pull_request:
+    branches: [releases/**]
+
+env:
+  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
+
+jobs:
+  cpack:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [18.04, 20.04]
+        rocm-version: [4.5, 5.0, 5.1]
+        extensions: ["--rocm +python", "--core +python"]
+
+    steps:
+      - name: Patch Git
+        timeout-minutes: 5
+        run: |
+          apt-get update
+          apt-get install -y software-properties-common
+          add-apt-repository -y ppa:git-core/ppa
+          apt-get update
+          apt-get upgrade -y
+          apt-get install -y git
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Build Base Container
+        timeout-minutes: 20
+        run: |
+          pushd docker
+          ./build-docker.sh --distro ubuntu --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }}
+          popd
+
+      - name: Build Release
+        timeout-minutes: 20
+        run: |
+          pushd docker
+          ./build-docker-release.sh --distro ubuntu --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }} -- ${{ matrix.extensions }}
+          popd
+
+      - name: List Files
+        timeout-minutes: 10
+        run: |
+          find . -type f | egrep '\.(sh|deb|rpm)$'
+
+      - name: STGZ Artifacts
+        timeout-minutes: 10
+        uses: actions/upload-artifact@v2
+        with:
+          name: ubuntu-stgz-installers
+          path: |
+            build-release/stgz/omnitrace-*.sh
+
+      - name: DEB Artifacts
+        timeout-minutes: 10
+        uses: actions/upload-artifact@v2
+        with:
+          name: ubuntu-deb-installers
+          path: |
+            build-release/deb/omnitrace_*.deb
+
+      # before testing remove any artifacts of the build
+      - name: Remove Build and Install
+        timeout-minutes: 10
+        run: |
+          mv build-release/stgz/omnitrace-*.sh ./
+          mv build-release/deb/omnitrace_*.deb ./
+          rm -rf build-release
+          rm -rf /opt/omnitrace
+
+      - name: STGZ Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          mkdir /opt/omnitrace-stgz
+          ./omnitrace-*.sh --prefix=/opt/omnitrace-stgz --skip-license --exclude-dir
+
+      - name: List STGZ Install
+        timeout-minutes: 10
+        continue-on-error: true
+        run: |
+          find /opt/omnitrace-stgz
+
+      - name: Test STGZ Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          export PATH=/opt/omnitrace-stgz/bin:${PATH}
+          export LD_LIBRARY_PATH=/opt/omnitrace-stgz/lib:${LD_LIBRARY_PATH}
+          omnitrace-avail --help
+          omnitrace --help
+          omnitrace-critical-trace --help
+
+      - name: DEB Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          dpkg --contents ./omnitrace_*.deb
+          dpkg -i ./omnitrace_*.deb
+
+      - name: List DEB Install
+        timeout-minutes: 10
+        continue-on-error: true
+        run: |
+          find /opt/omnitrace
+
+      - name: Test DEB Install
+        timeout-minutes: 10
+        run: |
+          set -v
+          export PATH=/opt/omnitrace/bin:${PATH}
+          export LD_LIBRARY_PATH=/opt/omnitrace/lib:${LD_LIBRARY_PATH}
+          omnitrace-avail --help
+          omnitrace --help
@@ -16,7 +16,7 @@ RUN yum update -y && \
    yum groupinstall -y "Development Tools" && \
    yum install -y centos-release-scl && \
    yum install -y epel-release && \
-    yum install -y devtoolset-9 python3-pip openmpi3-devel zlib-devel numactl-devel papi-devel dpkg-devel dpkg-dev wget && \
+    yum install -y devtoolset-9 python3-pip openmpi3-devel zlib-devel numactl-devel papi-devel dpkg-devel dpkg-dev wget curl && \
    python3 -m pip install 'cmake==3.18.4'

 ARG AMDGPU_RPM=21.40.2/rhel/7.9/amdgpu-install-21.40.2.40502-1.el7.noarch.rpm
@@ -28,7 +28,7 @@ RUN yum install -y https://repo.radeon.com/amdgpu-install/${AMDGPU_RPM} && \
    yum update -y && \
    yum clean all

-ARG PYTHON_VERSIONS="6 7 8 9"
+ARG PYTHON_VERSIONS="6 7 8 9 10"

 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
    bash miniconda.sh -b -p /opt/conda && \
@@ -15,7 +15,7 @@ ENV PATH /usr/local/bin:${PATH}
 RUN zypper update -y && \
    zypper dist-upgrade -y && \
    zypper install -y -t pattern devel_basis && \
-    zypper install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build wget && \
+    zypper install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build wget curl binutils-gold && \
    python3 -m pip install 'cmake==3.18.4'

 # ARG AMDGPU_RPM=21.40.2/sle/15/amdgpu-install-21.40.2.40502-1.noarch.rpm
@@ -28,7 +28,7 @@ RUN zypper --no-gpg-checks install -y https://repo.radeon.com/amdgpu-install/${A
    zypper install -y rocm-hip-sdk roctracer-dev rocm-smi-lib rocprofiler-dev && \
    zypper clean --all

-ARG PYTHON_VERSIONS="6 7 8 9"
+ARG PYTHON_VERSIONS="6 7 8 9 10"

 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
    bash miniconda.sh -b -p /opt/conda && \
@@ -38,6 +38,6 @@ RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -
    for i in ${PYTHON_VERSIONS}; do conda create -n py3.${i} -c defaults python=3.${i} pip; done && \
    conda clean -a -y && \
    conda init
-
+œ
 WORKDIR /home
 SHELL [ "/bin/bash", "--login", "-c" ]
@@ -19,7 +19,7 @@ ARG NJOBS="12"
 RUN zypper update -y && \
    zypper dist-upgrade -y && \
    zypper install -y -t pattern devel_basis && \
-    zypper install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build papi-devel && \
+    zypper install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build papi-devel curl wget && \
    python3 -m pip install 'cmake==3.18.4'

 COPY ./dyninst-source /tmp/dyninst
@@ -32,5 +32,18 @@ RUN cd /tmp/dyninst && \
    shopt -s dotglob extglob && \
    rm -rf *

+ARG PYTHON_VERSIONS="6 7 8 9 10"
+
+RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
+    bash miniconda.sh -b -p /opt/conda && \
+    export PATH="/opt/conda/bin:${PATH}" && \
+    conda config --set always_yes yes --set changeps1 no && \
+    conda update -c defaults -n base conda && \
+    for i in ${PYTHON_VERSIONS}; do conda create -n py3.${i} -c defaults python=3.${i} pip numpy; done && \
+    conda clean -a -y && \
+    cd /tmp && \
+    shopt -s dotglob extglob && \
+    rm -rf *
+
 WORKDIR /home
 SHELL [ "/bin/bash", "--login", "-c" ]
@@ -17,12 +17,12 @@ SHELL [ "/bin/bash", "-c" ]
 ARG EXTRA_PACKAGES=""
 ARG ROCM_REPO_VERSION="debian"
 ARG ROCM_REPO_DIST="ubuntu"
-ARG PYTHON_VERSIONS="6 7 8 9"
+ARG PYTHON_VERSIONS="6 7 8 9 10"
 ENV PATH ${HOME}/.local/bin:${PATH}

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev rpm librpm-dev && \
+    apt-get install -y build-essential cmake libnuma-dev wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev-dev libopenmpi-dev rpm librpm-dev curl && \
    python3 -m pip install 'cmake==3.18.4' && \
    wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - && \
    echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${ROCM_REPO_VERSION}/ ${ROCM_REPO_DIST} main" | tee /etc/apt/sources.list.d/rocm.list && \
@@ -15,7 +15,7 @@ SHELL [ "/bin/bash", "-c" ]
 ARG EXTRA_PACKAGES=""
 ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
 ARG NJOBS="12"
-ARG PYTHON_VERSIONS="6 7 8 9"
+ARG PYTHON_VERSIONS="6 7 8 9 10"

 ENV PATH ${HOME}/.local/bin:${PATH}
 ENV LIBRARY_PATH /usr/local/lib:/usr/local/lib64:${LIBRARY_PATH}
@@ -26,7 +26,7 @@ COPY ./dyninst-source /tmp/dyninst

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y build-essential cmake wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release zlib1g-dev libpapi-dev libpfm4-dev zip unzip locales bzip2 gzip && \
+    apt-get install -y build-essential cmake wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release zlib1g-dev libpapi-dev libpfm4-dev zip unzip locales bzip2 gzip curl && \
    python3 -m pip install 'cmake==3.18.4' && \
    apt-get autoclean && \
    locale -a && \
@@ -40,7 +40,7 @@ build-release()
 : ${VERSIONS:=20.04 18.04}
 : ${ROCM_VERSIONS:=5.0 4.5 4.3}
 : ${MPI:=0}
-: ${PYTHON_VERSIONS:=6 7 8 9}
+: ${PYTHON_VERSIONS:="6 7 8 9 10"}

 n=0
 while [[ $# -gt 0 ]]
@@ -3,7 +3,7 @@
 : ${ROCM_VERSIONS:="5.0 4.5 4.3"}
 : ${DISTRO:=ubuntu}
 : ${VERSIONS:=20.04 18.04}
-: ${PYTHON_VERSIONS:="6 7 8 9"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10"}
 : ${CI:=""}

 set -e
@@ -122,16 +122,31 @@ do
                    ;;
            esac
            case "${i}" in
-                5.0*)
-                    ROCM_RPM=latest/sle/15/amdgpu-install-21.50.50000-1.noarch.rpm
+                5.1.2)
+                    ROCM_RPM=22.10.2/sle/15/amdgpu-install-22.10.2.50102-1.noarch.rpm
                    ;;
-                4.5 | 4.5.2)
+                5.1.1)
+                    ROCM_RPM=22.10.1/sle/15/amdgpu-install-22.10.1.50101-1.noarch.rpm
+                    ;;
+                5.1 | 5.1.0)
+                    ROCM_RPM=22.10/sle/15/amdgpu-install-22.10.50100-1.noarch.rpm
+                    ;;
+                5.0.2)
+                    ROCM_RPM=21.50.2/sle/15/amdgpu-install-21.50.2.50002-1.noarch.rpm
+                    ;;
+                5.0.1)
+                    ROCM_RPM=21.50.1/sle/15/amdgpu-install-21.50.1.50001-1.noarch.rpm
+                    ;;
+                5.0 | 5.0.0)
+                    ROCM_RPM=21.50/sle/15/amdgpu-install-21.50.50000-1.noarch.rpm
+                    ;;
+                4.5.2)
                    ROCM_RPM=21.40.2/sle/15/amdgpu-install-21.40.2.40502-1.noarch.rpm
                    ;;
                4.5.1)
                    ROCM_RPM=21.40.1/sle/15/amdgpu-install-21.40.1.40501-1.noarch.rpm
                    ;;
-                4.5.0)
+                4.5 | 4.5.0)
                    ROCM_RPM=21.40/sle/15/amdgpu-install-21.40.1.40501-1.noarch.rpm
                    ;;
                *)
@@ -7,7 +7,7 @@
 : ${NJOBS:=12}
 : ${DISTRO:=""}
 : ${LTO:="OFF"}
-: ${PYTHON_VERSIONS:="6 7 8 9"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10"}
 : ${GENERATORS:="STGZ DEB RPM"}
 : ${MPI_IMPL:="openmpi"}
 : ${CLEAN:=0}
@@ -21,12 +21,15 @@ if [ -z "${DISTRO}" ]; then
    fi
 fi

+NPROC=$(nproc)
+if [ ${NJOBS} -gt ${NPROC} ]; then NJOBS=${NPROC}; fi
+
 CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCPACK_GENERATOR=STGZ"
-OMNITRACE_GENERAL_ARGS="-DOMNITRACE_CPACK_SYSTEM_NAME=${DISTRO} -DOMNITRACE_ROCM_VERSION=${ROCM_VERSION} -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_STRIP_LIBRARIES=OFF"
+OMNITRACE_GENERAL_ARGS="-DOMNITRACE_CPACK_SYSTEM_NAME=${DISTRO} -DOMNITRACE_ROCM_VERSION=${ROCM_VERSION} -DOMNITRACE_MAX_THREADS=2048 -DOMNITRACE_STRIP_LIBRARIES=OFF -DOMNITRACE_INSTALL_PERFETTO_TOOLS=ON"
 OMNITRACE_BUILD_ARGS="-DOMNITRACE_BUILD_TESTING=OFF -DOMNITRACE_BUILD_EXAMPLES=OFF -DOMNITRACE_BUILD_PAPI=ON -DOMNITRACE_BUILD_LTO=${LTO} -DOMNITRACE_BUILD_HIDDEN_VISIBILITY=OFF"
 OMNITRACE_USE_ARGS="-DOMNITRACE_USE_MPI_HEADERS=ON -DOMNITRACE_USE_OMPT=ON -DOMNITRACE_USE_PAPI=ON"
 TIMEMORY_ARGS="-DTIMEMORY_USE_LIBUNWIND=ON -DTIMEMORY_BUILD_LIBUNWIND=ON -DTIMEMORY_BUILD_PORTABLE=ON"
-DYNINST_ARGS="${STANDARD_ARGS} -DOMNITRACE_BUILD_DYNINST=ON $(echo -DDYNINST_BUILD_{TBB,BOOST,ELFUTILS,LIBIBERTY}=ON)"
+DYNINST_ARGS="-DOMNITRACE_BUILD_DYNINST=ON -DDYNINST_USE_OpenMP=ON $(echo -DDYNINST_BUILD_{TBB,BOOST,ELFUTILS,LIBIBERTY}=ON)"
 STANDARD_ARGS="${CMAKE_ARGS} ${OMNITRACE_GENERAL_ARGS} ${OMNITRACE_USE_ARGS} ${OMNITRACE_BUILD_ARGS} ${TIMEMORY_ARGS} ${DYNINST_ARGS} ${EXTRA_ARGS}"

 SCRIPT_DIR=$(realpath $(dirname ${BASH_SOURCE[0]}))
@@ -231,7 +234,7 @@ if [ -d /opt/conda/bin ]; then
    source activate
 fi

-build-and-package ${WITH_CORE} ${DISTRO}-core -DDYNINST_USE_OpenMP=OFF -DOMNITRACE_USE_HIP=OFF
-build-and-package ${WITH_MPI} ${DISTRO}-${MPI_IMPL} -DOMNITRACE_USE_HIP=ON -DDYNINST_USE_OpenMP=ON
-build-and-package ${WITH_ROCM} ${DISTRO}-rocm-${ROCM_VERSION} -DOMNITRACE_USE_HIP=ON -DDYNINST_USE_OpenMP=ON
-build-and-package ${WITH_ROCM_MPI} ${DISTRO}-rocm-${ROCM_VERSION}-${MPI_IMPL} -DOMNITRACE_USE_HIP=ON -DDYNINST_USE_OpenMP=ON -DOMNITRACE_USE_MPI=ON
+build-and-package ${WITH_CORE} ${DISTRO}-core -DOMNITRACE_USE_HIP=OFF
+build-and-package ${WITH_MPI} ${DISTRO}-${MPI_IMPL} -DOMNITRACE_USE_HIP=ON
+build-and-package ${WITH_ROCM} ${DISTRO}-rocm-${ROCM_VERSION} -DOMNITRACE_USE_HIP=ON
+build-and-package ${WITH_ROCM_MPI} ${DISTRO}-rocm-${ROCM_VERSION}-${MPI_IMPL} -DOMNITRACE_USE_HIP=ON -DOMNITRACE_USE_MPI=ON