Skip to content

Fix build failure due to crossed merges - #23954

Merged
vyasr merged 1 commit into
NVIDIA:mainfrom
davidwendt:fix-merge-error
Sep 2, 2026
Merged

Fix build failure due to crossed merges#23954
vyasr merged 1 commit into
NVIDIA:mainfrom
davidwendt:fix-merge-error

Conversation

@davidwendt

@davidwendt davidwendt commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Description

Fixes a build failure caused by a crossed merge paths of separate PRs. The unicode-normalize PR #23403 merged 2 days ago was not incorporated in the #23642 changes merged today.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@davidwendt davidwendt self-assigned this Sep 2, 2026
@davidwendt
davidwendt requested a review from a team as a code owner September 2, 2026 21:11
@davidwendt davidwendt added bug Something isn't working 3 - Ready for Review Ready for review by team libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change labels Sep 2, 2026
@coderabbitai

coderabbitai Bot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 550dfd5d-b56a-42c9-b44d-3583b4de9a88

📥 Commits

Reviewing files that changed from the base of the PR and between 6b5b038 and 99c574a.

📒 Files selected for processing (1)
  • cpp/src/text/unicode_normalize.cu

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.


📝 Summary

Summary by CodeRabbit

  • Bug Fixes
    • Improved the reliability of Unicode text normalization by ensuring temporary processing memory is handled consistently during normalization operations.
    • No changes were made to the public interface or user-facing functionality.

Walkthrough

Changes

Unicode normalization

Layer / File(s) Summary
Offset scan memory resource wiring
cpp/src/text/unicode_normalize.cu
Both sizes_to_offsets calls now receive temp_mr during Unicode normalization.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 99c57

This localized build-fix change is merge-ready after normal checks and review; no actionable merge-blocking risk remains.

Suggested reviewers: vyasr

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 2 functions across 1 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description check ✅ Passed The description clearly explains that the change fixes a build failure caused by crossed merge paths and identifies the affected Unicode normalization changes.
Title check ✅ Passed The title clearly summarizes the main change: fixing a build failure caused by crossed merges.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
  • Fix all pre-merge checks with AI
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@davidwendt

Copy link
Copy Markdown
Contributor Author

/merge

@vyasr

vyasr commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Admin-merging to unblock CI. The C++ build is all done so the core fix is working.

@vyasr
vyasr merged commit bd9c9b6 into NVIDIA:main Sep 2, 2026
82 of 96 checks passed
@davidwendt
davidwendt deleted the fix-merge-error branch September 3, 2026 02:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3 - Ready for Review Ready for review by team bug Something isn't working libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants