Skip to content

fix(ci): unbreak nightly whl build (hipThreads skip + box_filter libomp) - #513

Merged
zichguan-amd merged 2 commits into
amd-stagingfrom
zichguan/nightly-omp-hipcxx
Sep 3, 2026
Merged

fix(ci): unbreak nightly whl build (hipThreads skip + box_filter libomp)#513
zichguan-amd merged 2 commits into
amd-stagingfrom
zichguan/nightly-omp-hipcxx

Conversation

@zichguan-amd

Copy link
Copy Markdown
Collaborator

Summary

Fixes two failures in the nightly TheRock whl (whl-multi-arch) CI build, validated end-to-end in a local multiarch container against 10.1.0a20260902 (current latest).

  • hipThreads unbuildable on nightly whl. The whl ships hipthreads headers + libhipthreads.a but an empty include/libhipcxx/ (Disable libhipcxx and hipthreads TheRock#7530), so every hipthreads-linked example fails with fatal error: 'hip/atomic' file not found. Added a nightly build-skip for the whole Libraries/hipThreads tree in skip_manifest.py, and wired Libraries/Makefile with the skip_here machinery (mirroring HIP-Basic/Makefile) so the Make build honors SKIP_FROM_BUILD/SKIP_FROM_TEST. The CMake side was already covered by Common/SkipExamples.cmake.
  • box_filter can't find libomp. RPP/box_filter's find_library(omp REQUIRED) missed the wheel's bundled libomp, which lives under lib/llvm/lib/x86_64-unknown-linux-gnu/. Added that triplet dir to PATH_SUFFIXES so it resolves across distros with no system libomp package.
  • Docs cleanup. Dropped a dangling ./run-tests.sh reference (a helper never committed) from the ubuntu-24.04/26.04 Dockerfile headers.

Validation (local multiarch container, nightly whl 10.1.0a20260902)

  • Generator emits SKIP_FROM_BUILD=Libraries/hipThreads and writes .github/build_tools/skip_build.txt.
  • Make: make -C Libraries hipThreads SKIP_FROM_BUILD=Libraries/hipThreads drops it, no compile attempted.
  • CMake: SkipExamples: skipping Libraries/hipThreads (build-skip manifest), configure exits 0.
  • box_filter: clean recompile+link succeeds; ldd confirms it links .../lib/llvm/lib/x86_64-unknown-linux-gnu/libomp.so.
  • Full-tree CMake configure exits 0 with no "Could not find omp" and no CMake errors.

Test plan

  • Nightly whl-multi-arch CI build is green (hipThreads skipped, RPP/box_filter builds)
  • Skip summary in the CI step shows the Libraries/hipThreads build skip on the nightly channel
  • Stable channel unaffected (hipThreads skip is channels: ["nightly"]-scoped)

🤖 Generated with Claude Code

zichguan-amd and others added 2 commits September 2, 2026 14:53
…bomp

The TheRock nightly whl ships hipthreads headers + libhipthreads.a but an
empty include/libhipcxx (ROCm/TheRock#7530), so every hipthreads-linked
example fails to compile. Add a nightly build-skip for the whole
Libraries/hipThreads tree in the skip manifest and wire Libraries/Makefile
with the skip_here machinery (mirroring HIP-Basic/Makefile) so the Make
build honors SKIP_FROM_BUILD/SKIP_FROM_TEST.

Separately, RPP/box_filter's find_library(omp) missed the wheel's bundled
libomp, which lives under lib/llvm/lib/x86_64-unknown-linux-gnu/. Add that
triplet dir to PATH_SUFFIXES so the required OMP_LIBRARY resolves across
distros without a system libomp package.

Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
…eaders

The ubuntu-24.04/26.04 multiarch Dockerfile headers pointed users at a
./run-tests.sh helper that was never committed to the repo. Remove the
stale "Run tests (preferred)" block.

Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
@zichguan-amd
zichguan-amd requested a review from a team as a code owner September 2, 2026 19:01

@mapatel-amd mapatel-amd left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zichguan-amd
zichguan-amd merged commit b5e5d14 into amd-staging Sep 3, 2026
14 of 18 checks passed
@zichguan-amd
zichguan-amd deleted the zichguan/nightly-omp-hipcxx branch September 3, 2026 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants