Repository navigation
Conversation
Resolve two unresolved Git conflict markers in core/test/test_hip_smoke.c (lines 363 and 644) left by post-merge-train sweep commit 24bb5da. Both markers resolved by keeping the HEAD side: the float_ansnr_hip extractor test and its test-list entry are correctly omitted (the extractor was dropped by ADR-0720 / PR #38). Replace hard-fail mu_assert after vmaf_cuda_state_init with a skip-gracefully pattern in two GPU test files: - test_gpu_picture_pool.c::test_ring_buffer: emits [skip: no CUDA device] and returns NULL on init failure, preventing a NULL-deref SIGSEGV. - test_cuda_pic_preallocation.c: all four preallocation sub-tests (none / host / host_pinned / device) now skip when no CUDA device is present rather than hard-failing. Six deliverables (ADR-0108): 1. no digest needed: trivial 2. no alternatives: only-one-way fix 3. AGENTS.md invariant note added to core/test/AGENTS.md 4. reproducer: grep -E '^(<<<<<<<|=======|>>>>>>>)' core/test/test_hip_smoke.c 5. changelog.d/fixed/hip-smoke-conflict-markers-and-gpu-test-skip.md 6. docs/rebase-notes.md entry added; no rebase impact Closes: T-CI-HIP-SMOKE-MARKERS, T-CI-GPU-TESTS-HARD-FAIL Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
lusoris
enabled auto-merge (squash)
May 29, 2026 16:57
lusoris
deleted the
fix/test-hip-smoke-conflict-markers-and-gpu-test-skip-20260529
branch
May 29, 2026 21:26
4 of 8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
core/test/test_hip_smoke.c(lines 363 and 644 on master) left by post-merge-train sweep commit24bb5daf89. HEAD side retained: thefloat_ansnr_hipextractor test is correctly omitted (dropped by ADR-0720 / PR feat(core): drop legacy ansnr feature (pre-VMAF, never Netflix-adopted) #38).test_gpu_picture_pool.c::test_ring_buffer(lines 49–53): added skip-gracefully guard — checksvmaf_cuda_state_initreturn value, emits[skip: no CUDA device], returns NULL on failure, preventing a NULL-deref SIGSEGV on CPU-only runners.test_cuda_pic_preallocation.c(line 77–78 pattern, all four sub-tests): replaced hard-failmu_assertaftervmaf_cuda_state_initwith the same skip pattern.Six deliverables (ADR-0108)
core/test/AGENTS.md— GPU tests must skip gracefully when no device (rebase-sensitive)grep -E '^(<<<<<<<|=======|>>>>>>>)' core/test/test_hip_smoke.c→ must return emptychangelog.d/fixed/hip-smoke-conflict-markers-and-gpu-test-skip.mddocs/rebase-notes.mdentry added; no rebase impact (all files fork-local)State.md
Closes
T-CI-HIP-SMOKE-MARKERS+T-CI-GPU-TESTS-HARD-FAIL(row added todocs/state.mdin this PR).Test plan
grep -E '^(<<<<<<<|=======|>>>>>>>)' core/test/test_hip_smoke.creturns emptymeson setup build-test core -Denable_cuda=false -Denable_sycl=false && ninja -C build-test— clean build confirmed locally (724/724 targets)pre-commit run --files core/test/test_hip_smoke.c core/test/test_gpu_picture_pool.c core/test/test_cuda_pic_preallocation.c— all hooks passed🤖 Generated with Claude Code