Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-24.02 to branch-24.04 #14810

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Conversation

GPUtester
Copy link
Collaborator

Forward-merge triggered by push to branch-24.02 that creates a PR to keep branch-24.04 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

shwina and others added 2 commits January 19, 2024 20:40
…ts against `BaseOffset` (#14678)

Addresses part of #14674.

This PR makes `cudf.pandas` aware of the `BaseOffset` type. Because of the way `isinstance()` checks work on proxy types*, we will now pass instance checks like:

```python
freq = "D"
assert isinstance(pd.tseries.frequencies.to_offset(freq), pd.tseries.offsets.BaseOffset)
```

*proxy types appear to be related to each other in the same way as their corresponding slow types. So if `A` inherits from `B`, then `ProxyA` _appears_ to inherit from `ProxyB` even though they are not _actually_ related by inheritance.

Authors:
  - Ashwin Srinath (https://github.com/shwina)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #14678
… types (#14612)

Creates `cudf::strings::detail::make_offsets_child_column` for specific use with strings offsets to enable int64 offsets.
This also introduces the `LIBCUDF_LARGE_STRINGS_THRESHOLD` environment variable which can be used at runtime to produce int64 offsets for an arbitrary number of character bytes. This utility is not used in this PR but will be employed in a future PR.

Authors:
  - David Wendt (https://github.com/davidwendt)

Approvers:
  - MithunR (https://github.com/mythrocks)
  - Nghia Truong (https://github.com/ttnghia)
  - Karthikeyan (https://github.com/karthikeyann)

URL: #14612
@GPUtester GPUtester requested review from a team as code owners January 19, 2024 20:51
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API. labels Jan 19, 2024
@GPUtester GPUtester merged commit aae3e14 into branch-24.04 Jan 19, 2024
5 of 21 checks passed
@GPUtester
Copy link
Collaborator Author

SUCCESS - forward-merge complete.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants