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

Branch 23.12 merge 23.10 #1873

Merged

Conversation

AyodeAwe
Copy link
Contributor

@AyodeAwe AyodeAwe commented Oct 5, 2023

Fixing the accidental squash merge in #1868

trxcllnt and others added 6 commits September 27, 2023 13:25
This PR adds some [devcontainers](https://containers.dev/) to help simplify building the RAFT C++ and Python libraries.

It also adds an optional job to the `pr.yaml` to [build the RAFT libs in each devcontainer](https://github.com/trxcllnt/raft/blob/fea/devcontainers/.github/workflows/pr.yaml#L96-L101), so the build caches are populated for devs by CI.

A devcontainer can be launched by clicking the "Reopen in Container" button that VSCode shows when opening the repo (or by using the "Rebuild and Reopen in Container" command from the command palette):
![image](https://user-images.githubusercontent.com/178183/221771999-97ab29d5-e718-4e5f-b32f-2cdd51bba25c.png)

Clicking this button will cause VSCode to prompt the user to select one of these devcontainer variants:
![image](https://github.com/rapidsai/rmm/assets/178183/68d4b264-4fc2-4008-92b6-cb4bdd19b29f)

On startup, the devcontainer creates or updates the conda/pip environment using `raft/dependencies.yaml`. The envs/package caches are cached on the host via volume mounts, which are described in more detail in [`.devcontainer/README.md`](https://github.com/trxcllnt/raft/blob/fea/devcontainers/.devcontainer/README.md).

The container includes convenience functions to clean, configure, and build the various RAFT components:

```shell
$ clean-raft-cpp # only cleans the C++ build dir
$ clean-pylibraft-python # only cleans the Python build dir
$ clean-raft # cleans both C++ and Python build dirs

$ configure-raft-cpp # only configures raft C++ lib

$ build-raft-cpp # only builds raft C++ lib
$ build-pylibraft-python # only builds raft Python lib
$ build-raft # builds both C++ and Python libs
```

* The C++ build script is a small wrapper around `cmake -S ~/raft/cpp -B ~/raft/cpp/build` and `cmake --build ~/raft/cpp/build`
* The Python build script is a small wrapper around `pip install --editable ~/raft/cpp`

Unlike `build.sh`, these convenience scripts *don't* install the libraries after building them. Instead, they automatically inject the correct arguments to build the C++ libraries from source and use their build dirs as package roots:

```shell
$ cmake -S ~/raft/cpp -B ~/raft/cpp/build
$ CMAKE_ARGS="-Draft_ROOT=~/raft/cpp/build" \ # <-- this argument is automatic
  pip install -e ~/raft/cpp
```

Authors:
  - Paul Taylor (https://github.com/trxcllnt)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)
  - Jake Awe (https://github.com/AyodeAwe)

URL: rapidsai#1791
This PR pins `dask` and `distributed` to `2023.9.2` for `23.10` release.

xref: rapidsai/cudf#14225

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

Approvers:
   - Ray Douglass (https://github.com/raydouglass)
   - Peter Andreas Entschev (https://github.com/pentschev)
   - Ben Frederickson (https://github.com/benfred)
…idsai#1862)

This PR fixes a bug in the filtering operations in the CAGRA multi-kernel search implementation. This bug caused the test of rapidsai#1837 to fail.

Authors:
   - tsuki (https://github.com/enp1s0)

Approvers:
   - Micka (https://github.com/lowener)
   - Corey J. Nolet (https://github.com/cjnolet)
…orms (rapidsai#1865)

This makes the faiss integration substantially easier, since we can just use the existing norms that have already been calculated in GpuDistanceParams::vectorNorms - rather than require an owned copy that lives in the brute force index.

Authors:
   - Ben Frederickson (https://github.com/benfred)

Approvers:
   - Corey J. Nolet (https://github.com/cjnolet)
Closes rapidsai#1600.
To be merged after rapidsai#1803 and rapidsai#1811
This PR adds `bitset_filter` to filter an index with a bitset.

Authors:
   - Micka (https://github.com/lowener)
   - tsuki (https://github.com/enp1s0)
   - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
   - Corey J. Nolet (https://github.com/cjnolet)
@AyodeAwe AyodeAwe requested a review from a team as a code owner October 5, 2023 19:17
@github-actions github-actions bot added the cpp label Oct 5, 2023
@AyodeAwe AyodeAwe added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Oct 5, 2023
@raydouglass raydouglass merged commit de21b85 into rapidsai:branch-23.12 Oct 5, 2023
64 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cpp 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.

8 participants