Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/rocprofiler-systems-build-group.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
-DROCPROFSYS_BUILD_EXAMPLES=ON
-DROCPROFSYS_USE_PYTHON=ON
-DROCPROFSYS_BUILD_DYNINST=ON
-DROCPROFSYS_BUILD_TBB=ON
-DROCPROFSYS_BUILD_ELFUTILS=ON
-DROCPROFSYS_BUILD_LIBIBERTY=ON
-DROCPROFSYS_MAX_THREADS=64
Expand Down Expand Up @@ -369,7 +368,7 @@ jobs:

# ──────────────────────────────────────────────────────────────────────────
# System-dependency builds: validate that system-provided libs substitute
# for the bundled ones (BUILD_{TBB,ELFUTILS,LIBIBERTY}=OFF).
# for the bundled ones (BUILD_{ELFUTILS,LIBIBERTY}=OFF).
# Matrix entries are filtered to the selected distro group.
# ──────────────────────────────────────────────────────────────────────────
system-deps:
Expand Down Expand Up @@ -403,7 +402,6 @@ jobs:
-DROCPROFSYS_BUILD_EXAMPLES=ON
-DROCPROFSYS_USE_PYTHON=ON
-DROCPROFSYS_BUILD_DYNINST=ON
-DROCPROFSYS_BUILD_TBB=OFF
-DROCPROFSYS_BUILD_ELFUTILS=OFF
-DROCPROFSYS_BUILD_LIBIBERTY=OFF
-DROCPROFSYS_BUILD_HIDDEN_VISIBILITY=ON
Expand Down Expand Up @@ -469,7 +467,7 @@ jobs:
max_attempts: 5
shell: bash
command: |
dnf install -y --enablerepo=crb tbb-devel fmt-devel spdlog-devel
dnf install -y --enablerepo=crb fmt-devel spdlog-devel
dnf install -y binutils-devel
dnf clean all

Expand All @@ -496,7 +494,7 @@ jobs:
git config --global --add safe.directory ${PWD}
echo "CMake: $(cmake --version | head -n 1)"
echo "Compiler: $(${{ matrix.compiler }} --version | head -n 1)"
echo "Testing build with SYSTEM dependencies (ROCPROFSYS_BUILD_{TBB,ELFUTILS,LIBIBERTY}=OFF)"
echo "Testing build with SYSTEM dependencies (ROCPROFSYS_BUILD_{ELFUTILS,LIBIBERTY}=OFF)"
python3 ./scripts/run-ci.py --stage generate \
--name "${{ github.repository_owner }}-${{ github.ref_name }}-${{ matrix.cdash_suffix }}" \
--build-jobs $(nproc) \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rocprofiler-systems-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ jobs:
-DROCPROFSYS_BUILD_TESTING=OFF \
-DROCPROFSYS_USE_PYTHON=ON \
-DROCPROFSYS_BUILD_DYNINST=ON \
-DROCPROFSYS_BUILD_TBB=ON \
-DROCPROFSYS_BUILD_ELFUTILS=ON \
-DROCPROFSYS_BUILD_LIBIBERTY=ON \
-DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs \
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/rocprofiler-systems-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ jobs:
echo "ROCM_PATH=/opt/rocm" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/opt/rocm/lib:${LD_LIBRARY_PATH}" >> $GITHUB_ENV

# libtbb-dev is required by the baseline build below, which compiles the
# base branch. It can be dropped once the base branch no longer needs TBB.
- name: Install Packages
timeout-minutes: 25
uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 #v4.0.0
Expand Down Expand Up @@ -152,10 +154,15 @@ jobs:
--output-dir .codecov \
--label unit-tests-baseline

# git checkout updates the gitlink but leaves the submodule work tree at
# whatever the baseline build checked out, so sync it explicitly. Otherwise
# the PR is measured against the base branch's Dyninst.
- name: Checkout PR Branch
timeout-minutes: 5
timeout-minutes: 10
shell: bash
run: git checkout ${{ env.PR_SHA }}
run: |
git checkout ${{ env.PR_SHA }}
git submodule update --init --recursive projects/rocprofiler-systems/external/dyninst

- name: Build
timeout-minutes: 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ jobs:
-DCMAKE_PREFIX_PATH=${{ env.ROCM_PATH }} \
-DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems \
-DROCPROFSYS_BUILD_DYNINST=ON \
-DROCPROFSYS_BUILD_TBB=ON \
-DROCPROFSYS_BUILD_ELFUTILS=ON \
-DROCPROFSYS_BUILD_LIBIBERTY=ON \
-DROCPROFSYS_BUILD_CI=ON \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
build-essential bzip2 chrpath cmake curl environment-modules flex gettext \
git-core gnupg2 gzip iproute2 libboost-all-dev libdw-dev libdwarf-dev \
libelf-dev libgmock-dev libgtest-dev libiberty-dev libpapi-dev libpfm4-dev \
libsqlite3-dev libtbb-dev libtool locales lsb-release m4 ninja-build \
libsqlite3-dev libtool locales lsb-release m4 ninja-build \
nlohmann-json3-dev python3-pip software-properties-common unzip wget \
vim zip zlib1g-dev libucx-dev ucx-utils libomp-dev libopenmpi-dev &&
apt-get autoclean
Expand Down Expand Up @@ -178,7 +178,6 @@ jobs:
${SANITIZER_CMAKE_FLAGS} \
-DROCPROFSYS_BUILD_DYNINST=${{ matrix.build-dyninst }} \
-DROCPROFSYS_BUILD_BOOST=OFF \
-DROCPROFSYS_BUILD_TBB=OFF \
-DROCPROFSYS_BUILD_ELFUTILS=OFF \
-DROCPROFSYS_BUILD_LIBIBERTY=OFF \
-DROCPROFSYS_MAX_THREADS=64 \
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@
[submodule "projects/rocprofiler-compute/src/vendored/pyyaml"]
path = projects/rocprofiler-compute/src/vendored/pyyaml
url = https://github.com/yaml/pyyaml.git
[submodule "projects/rocprofiler-systems/external/onetbb"]
path = projects/rocprofiler-systems/external/onetbb
url = https://github.com/uxlfoundation/oneTBB.git
tag = v2022.3.0
[submodule "projects/rocprofiler-sdk/external/abseil-cpp"]
path = projects/rocprofiler-sdk/external/abseil-cpp
url = https://github.com/abseil/abseil-cpp.git
Expand Down
Loading
Loading