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 #5735

Merged
merged 4 commits into from
Jan 30, 2024

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Jan 30, 2024

Manual forward merge from 24.02 to 24.04. This PR should not be squashed. Closes #5725.

raydouglass and others added 4 commits January 20, 2024 16:46
This resolves cmake failures such as the following:
```
CMake Error at /home/coder/cuml/cpp/build/release/_deps/raft-build/raft-targets.cmake:56 (set_target_properties):
      The link interface of target "raft::raft" contains:
        hnswlib::hnswlib
```

Also pin pytest to 7.x to avoid breaking changes from pytest 8. See rapidsai/cudf#14920

Authors:
  - Philip Hyunsu Cho (https://github.com/hcho3)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Bradley Dice (https://github.com/bdice)
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#5733
@bdice bdice added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jan 30, 2024
@bdice bdice requested review from a team as code owners January 30, 2024 15:43
@github-actions github-actions bot added conda conda issue Cython / Python Cython or Python issue CMake CUDA/C++ labels Jan 30, 2024
@bdice bdice self-assigned this Jan 30, 2024
@AyodeAwe AyodeAwe merged commit e94281e into rapidsai:branch-24.04 Jan 30, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake 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.

5 participants