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

Resolve auto-merger conflicts between branch-23.04 & branch-23.06 #5340

Merged

Conversation

galipremsagar
Copy link
Contributor

This PR resolves conflicts in automerger: #5336

galipremsagar and others added 4 commits April 6, 2023 01:05
This PR pins `dask` and `distributed` to `2023.3.2` and `2023.3.2.1` respectively for `23.04` release.


xref: rapidsai/cudf#13070

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: rapidsai#5333
Default batch size is changed in HDBSCAN soft clustering to avoid CUDA OOM errors in. large datasets.

Authors:
  - Tarang Jain (https://github.com/tarang-jain)
  - Dante Gama Dessavre (https://github.com/dantegd)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: rapidsai#5335
@galipremsagar galipremsagar requested review from a team as code owners April 6, 2023 17:59
@github-actions github-actions bot added ci conda conda issue CUDA/C++ Cython / Python Cython or Python issue labels Apr 6, 2023
@galipremsagar galipremsagar added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Apr 6, 2023
@raydouglass raydouglass merged commit fb9d4aa into rapidsai:branch-23.06 Apr 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci conda conda issue CUDA/C++ Cython / Python Cython or Python issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants