diff --git a/.github/workflows/rocprofiler-compute-rhel-8.yml b/.github/workflows/rocprofiler-compute-rhel-8.yml index 90e342d99e..53e9d7072d 100644 --- a/.github/workflows/rocprofiler-compute-rhel-8.yml +++ b/.github/workflows/rocprofiler-compute-rhel-8.yml @@ -54,6 +54,8 @@ jobs: if [ ${{ matrix.os-release }} == "8.10" ]; then yum -y install python39 yum -y install python39-devel + alternatives --set python3 /usr/bin/python3.9 + rm /usr/bin/python3.11 else yum -y install python3-devel fi @@ -81,8 +83,9 @@ jobs: - name: Install Python prereqs working-directory: projects/rocprofiler-compute run: | - python3.9 -m pip install -r requirements.txt - python3.9 -m pip install -r requirements-test.txt + python3 -m pip install -r requirements.txt + python3 -m pip install -r requirements-test.txt + python3 -m pip install cmake - name: Configure and install working-directory: projects/rocprofiler-compute run: | diff --git a/.github/workflows/rocprofiler-compute-tarball.yml b/.github/workflows/rocprofiler-compute-tarball.yml index 701e7650f5..735afd2047 100644 --- a/.github/workflows/rocprofiler-compute-tarball.yml +++ b/.github/workflows/rocprofiler-compute-tarball.yml @@ -5,12 +5,16 @@ on: branches: - develop paths: - - 'projects/rocprofiler-compute/**' - pull_request: - paths: + - '.github/workflows/rocprofiler-compute-tarball.yml' + - 'projects/rocprofiler-compute/**' + - '!projects/rocprofiler-compute/*.md' + - '!projects/rocprofiler-compute/docs/**' + - '!projects/rocprofiler-compute/docker/**' + pull_request: + paths: + - '.github/workflows/rocprofiler-compute-tarball.yml' - 'projects/rocprofiler-compute/**' - '!projects/rocprofiler-compute/*.md' - - '!projects/rocprofiler-compute/.github/**/*.md' - '!projects/rocprofiler-compute/docs/**' - '!projects/rocprofiler-compute/docker/**' @@ -18,9 +22,14 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +env: + ROCM_VERSION: "7.1.0" + jobs: distbuild: runs-on: ubuntu-latest + container: + image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-24.04 name: Create distribution tarball env: INSTALL_DIR: /tmp/foo1 @@ -38,6 +47,17 @@ jobs: with: sparse-checkout: projects/rocprofiler-compute ref: ${{ steps.sha-mode.sha }} + - name: Install ROCm Dependencies + shell: bash + run: | + ROCM_MAJOR=$(echo ${{ env.ROCM_VERSION }} | sed 's/\./ /g' | awk '{print $1}') + ROCM_MINOR=$(echo ${{ env.ROCM_VERSION }} | sed 's/\./ /g' | awk '{print $2}') + ROCM_VERSN=$(( (${ROCM_MAJOR}*10000)+(${ROCM_MINOR}*100) )) + wget -N -P /tmp/ https://repo.radeon.com/amdgpu-install/${ROCM_MAJOR}.${ROCM_MINOR}/ubuntu/noble/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get install -y /tmp/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get update + apt install -y rocm-dev + echo "✅ ROCm Dependencies Installed!" - name: Install Python uses: actions/setup-python@v5 with: @@ -64,6 +84,8 @@ jobs: retention-days: 3 disttest: runs-on: ubuntu-latest + container: + image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-24.04 needs: [distbuild] name: Tarball tests env: @@ -75,6 +97,17 @@ jobs: name: tarball-testing - name: Expand run: tar xfz rocprofiler-compute-*.tar.gz; rm rocprofiler-compute-*.tar.gz + - name: Install ROCm Dependencies + shell: bash + run: | + ROCM_MAJOR=$(echo ${{ env.ROCM_VERSION }} | sed 's/\./ /g' | awk '{print $1}') + ROCM_MINOR=$(echo ${{ env.ROCM_VERSION }} | sed 's/\./ /g' | awk '{print $2}') + ROCM_VERSN=$(( (${ROCM_MAJOR}*10000)+(${ROCM_MINOR}*100) )) + wget -N -P /tmp/ https://repo.radeon.com/amdgpu-install/${ROCM_MAJOR}.${ROCM_MINOR}/ubuntu/noble/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get install -y /tmp/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get update + apt install -y rocm-dev + echo "✅ ROCm Dependencies Installed!" - name: Python dependency installs run: | cd rocprofiler-compute-* diff --git a/projects/rocprofiler-compute/CMakeLists.txt b/projects/rocprofiler-compute/CMakeLists.txt index 3a8bdf6099..2a3512a674 100644 --- a/projects/rocprofiler-compute/CMakeLists.txt +++ b/projects/rocprofiler-compute/CMakeLists.txt @@ -648,6 +648,7 @@ install( "execute_process( COMMAND bash -c \"set -e cd \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX} + mkdir -p ${CMAKE_INSTALL_BINDIR} ln -sf ../${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/${EXECUTABLE_NAME} ${CMAKE_INSTALL_BINDIR}/${EXECUTABLE_NAME} \")" COMPONENT main