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

Simplify libcuvs conda recipe. #322

Merged
merged 4 commits into from
Sep 11, 2024

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Sep 10, 2024

This PR refactors the libcuvs conda recipe to use libraft-headers-only instead of libraft.

I removed dependencies on rmm from the cuvs build -- it is not imported.

I included a couple small fixes in CMake and the cuvs recipe.

@bdice bdice added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Sep 10, 2024
@bdice bdice self-assigned this Sep 10, 2024
@bdice bdice marked this pull request as ready for review September 10, 2024 18:18
@bdice bdice requested review from a team as code owners September 10, 2024 18:18
@bdice bdice requested a review from msarahan September 10, 2024 18:18
@@ -129,7 +129,8 @@ outputs:
- ninja
- {{ stdlib("c") }}
host:
- libraft ={{ minor_version }}
- librmm ={{ minor_version }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need librmm here because we #include it in libcuvs.

@@ -54,10 +54,8 @@ requirements:
- pylibraft {{ minor_version }}
- libcuvs {{ version }}
- python x.x
- rmm ={{ minor_version }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rmm (Python) is not used directly in cuvs Python code. It is not needed at build or run time.

conda/recipes/libcuvs/meta.yaml Outdated Show resolved Hide resolved
@@ -248,6 +248,9 @@ outputs:
- {{ compiler('cuda') }}
- cuda-cudart-dev
- libcublas-dev
- libcurand-dev
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes align libcuvs-examples with the -tests and other packages above. These are needed to build the examples, now that we're removing libraft. Previously libraft was supplying the CUDA math library dependencies.

Copy link

@msarahan msarahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no additional concerns beyond @cjnolet comment at https://github.com/rapidsai/cuvs/pull/322/files#r1752508397

@bdice bdice requested a review from cjnolet September 10, 2024 19:58
conda/recipes/libcuvs/meta.yaml Outdated Show resolved Hide resolved
conda/recipes/libcuvs/meta.yaml Outdated Show resolved Hide resolved
conda/recipes/libcuvs/meta.yaml Outdated Show resolved Hide resolved
conda/recipes/libcuvs/meta.yaml Outdated Show resolved Hide resolved
Copy link
Member

@cjnolet cjnolet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for these changes Bradley!

@bdice
Copy link
Contributor Author

bdice commented Sep 11, 2024

/merge

@rapids-bot rapids-bot bot merged commit a6b71d7 into rapidsai:branch-24.10 Sep 11, 2024
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake cpp improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
Development

Successfully merging this pull request may close these issues.

3 participants