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.

Sign up for GitHub

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
Merged

Simplify libcuvs conda recipe. #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2451a06
Simplify libcuvs conda recipe.
bdice Sep 10, 2024
d1a356b
Remove run dependencies on libraft-headers-only.
bdice Sep 10, 2024
c0aa378
Clean up librmm/rmm usage in conda recipes.
bdice Sep 10, 2024
5198ca3
Apply suggestions from code review
bdice Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions conda/recipes/cuvs/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

# Usage:
# conda build . -c conda-forge -c numba -c rapidsai -c pytorch
# conda build . -c rapidsai -c conda-forge -c nvidia
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set py_version = environ['CONDA_PY'] %}
Expand Down Expand Up @@ -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.

- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.10.0
- setuptools
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
Expand All @@ -68,7 +66,6 @@ requirements:
- pylibraft {{ minor_version }}
- libcuvs {{ version }}
- python x.x
- rmm ={{ minor_version }}
- cuda-python
- numpy >=1.23,<3.0a0

Expand All @@ -81,5 +78,4 @@ tests:
about:
home: https://rapids.ai/
license: Apache-2.0
# license_file: LICENSE
summary: cuvs python library
33 changes: 24 additions & 9 deletions conda/recipes/libcuvs/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

# Usage:
# conda build . -c conda-forge -c nvidia -c rapidsai
# conda build . -c rapidsai -c conda-forge -c nvidia
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
Expand Down Expand Up @@ -63,7 +63,8 @@ outputs:
- ninja
- {{ stdlib("c") }}
host:
- libraft ={{ minor_version }}
- librmm ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cuda-profiler-api {{ cuda11_cuda_profiler_api_host_version }}
Expand All @@ -84,7 +85,6 @@ outputs:
- libcusparse-dev
{% endif %}
run:
- libraft ={{ minor_version }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major != "11" %}
- cuda-cudart
Expand Down Expand Up @@ -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.

- libraft-headers ={{ minor_version }}
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cuda-profiler-api {{ cuda11_cuda_profiler_api_host_version }}
Expand All @@ -150,7 +151,6 @@ outputs:
- libcusparse-dev
{% endif %}
run:
- libraft ={{ minor_version }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major != "11" %}
- cuda-cudart
Expand Down Expand Up @@ -195,7 +195,8 @@ outputs:
- ninja
- {{ stdlib("c") }}
host:
- libraft ={{ minor_version }}
- librmm ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- {{ pin_subpackage('libcuvs', exact=True) }}
- cuda-version ={{ cuda_version }}
- openblas # required by some CPU algos in benchmarks
Expand Down Expand Up @@ -228,7 +229,6 @@ outputs:
- libcusolver
- libcusparse
{% endif %}
- libraft ={{ minor_version }}
- {{ pin_subpackage('libcuvs', exact=True) }}
about:
home: https://rapids.ai/
Expand All @@ -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.

- libcusolver-dev
- libcusparse-dev
{% endif %}
requirements:
build:
Expand All @@ -263,17 +266,27 @@ outputs:
- ninja
- {{ stdlib("c") }}
host:
- libraft ={{ minor_version }}
- librmm ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- {{ pin_subpackage('libcuvs', exact=True) }}
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cuda-profiler-api {{ cuda11_cuda_profiler_api_run_version }}
- libcublas {{ cuda11_libcublas_host_version }}
- libcublas-dev {{ cuda11_libcublas_host_version }}
- libcurand {{ cuda11_libcurand_host_version }}
- libcurand-dev {{ cuda11_libcurand_host_version }}
- libcusolver {{ cuda11_libcusolver_host_version }}
- libcusolver-dev {{ cuda11_libcusolver_host_version }}
- libcusparse {{ cuda11_libcusparse_host_version }}
- libcusparse-dev {{ cuda11_libcusparse_host_version }}
{% else %}
- cuda-cudart-dev
- cuda-profiler-api
- libcublas-dev
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
{% endif %}
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
Expand All @@ -282,8 +295,10 @@ outputs:
{% else %}
- cuda-cudart
- libcublas
- libcurand
- libcusolver
- libcusparse
{% endif %}
- libraft ={{ minor_version }}
- {{ pin_subpackage('libcuvs', exact=True) }}
about:
home: https://rapids.ai/
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

option(BUILD_SHARED_LIBS "Build cuvs shared libraries" ON)
option(BUILD_TESTS "Build cuvs unit-tests" ON)
option(BUILD_C_LIBRARY "Build raft C API library" OFF)
option(BUILD_C_TESTS "Build raft C API tests" OFF)
option(BUILD_C_LIBRARY "Build cuVS C API library" OFF)
option(BUILD_C_TESTS "Build cuVS C API tests" OFF)
option(BUILD_ANN_BENCH "Build cuVS ann benchmarks" OFF)
option(BUILD_CAGRA_HNSWLIB "Build CAGRA+hnswlib interface" ON)
option(CUDA_ENABLE_KERNELINFO "Enable kernel resource usage info" OFF)
Expand Down
Loading