Resolve conflicts in forward merger #15321 #15328
Merged
+96
−122
Conversation
This file contains 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
Issue rapidsai#15216 Avoids an OOB read; the read was not causing bugs as the read data was never used. Addresses the memcheck part of rapidsai#15216 Authors: - Vukasin Milovanovic (https://github.com/vuule) Approvers: - Bradley Dice (https://github.com/bdice) - Muhammad Haseeb (https://github.com/mhaseeb123) URL: rapidsai#15309
Fixes errors reported by `gtests/ERROR_TEST` when run with a Debug build. Both errors occur due to invalid stream usage.
```
[ RUN ] DebugAssert.cudf_assert_true
libcudf was not built with stacktrace support.
unknown file: Failure
C++ exception with description "cudf_identify_stream_usage found unexpected stream!" thrown in the test body.
[ RUN ] DebugAssertDeathTest.cudf_assert_false
libcudf was not built with stacktrace support.
/cudf/cpp/tests/error/error_handling_test.cu:112: Failure
Death test: call_kernel()
Result: threw an exception.
Error msg:
[ DEATH ]
[ DEATH ] /cudf/cpp/tests/error/error_handling_test.cu:112:: Caught std::exception-derived exception escaping the death test statement. Exception message: cudf_identify_stream_usage found unexpected stream!
```
Fixes the test logic to use the correct stream. These tests are only built/run with a Debug build.
Authors:
- David Wendt (https://github.com/davidwendt)
Approvers:
- Bradley Dice (https://github.com/bdice)
- Muhammad Haseeb (https://github.com/mhaseeb123)
URL: rapidsai#15317
xref rapidsai#14882 This PR replaces `black` with `ruff-format` with it's default configurations. The ruff configuration had a line length of 88 while black had a line length configuration of 79, so aligned them to 79. The next step would be to consider replacing `isort` too Authors: - Matthew Roeschke (https://github.com/mroeschke) Approvers: - GALI PREM SAGAR (https://github.com/galipremsagar) - Lawrence Mitchell (https://github.com/wence-) - Bradley Dice (https://github.com/bdice) URL: rapidsai#15312
…dsai#15293) Closes rapidsai#14140 Added a no-op CUDA call before creating a `kvikio::FileHandle` to avoid the error in `cuFileDriverOpen`. Authors: - Vukasin Milovanovic (https://github.com/vuule) Approvers: - David Wendt (https://github.com/davidwendt) - Yunsong Wang (https://github.com/PointKernel) URL: rapidsai#15293
This PR enables branch testing for `cudf.pandas` pandas pytest suite. This is 1st half of the actual changes I'd like to make. Once we merge this PR have a json file generated in s3 for `branch-24.04`, In a follow-up PR I will enable diff comparison and reporting. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Bradley Dice (https://github.com/bdice) - Jake Awe (https://github.com/AyodeAwe) URL: rapidsai#15316
github-actions
bot
added
libcudf
…6-merge-branch-24.04
galipremsagar
force-pushed
the
branch-24.06-merge-branch-24.04
branch
from
a75d1a8 to
27c5c01
Compare
ttnghia
approved these changes
Mar 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR resolves conflicts in
branch-24.06forward merger: #15321Checklist