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

remove unused 'joblib' and 'numba' dependencies, other packaging cleanup #2532

Merged
merged 3 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ repos:
[.](cmake|cpp|cu|cuh|h|hpp|sh|pxd|py|pyx)$|
CMakeLists[.]txt$|
CMakeLists_standalone[.]txt$|
meta[.]yaml$|
setup[.]cfg$
meta[.]yaml$
exclude: |
(?x)
cpp/include/raft/neighbors/detail/faiss_select/|
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies:
- gcc_linux-aarch64=11.*
- graphviz
- ipython
- joblib>=0.11
- libcublas-dev=11.11.3.6
- libcublas=11.11.3.6
- libcurand-dev=10.3.0.86
Expand All @@ -38,7 +37,6 @@ dependencies:
- libucxx==0.42.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-aarch64=11.8
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies:
- gcc_linux-64=11.*
- graphviz
- ipython
- joblib>=0.11
- libcublas-dev=11.11.3.6
- libcublas=11.11.3.6
- libcurand-dev=10.3.0.86
Expand All @@ -38,7 +37,6 @@ dependencies:
- libucxx==0.42.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-125_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ dependencies:
- gcc_linux-aarch64=11.*
- graphviz
- ipython
- joblib>=0.11
- libcublas-dev
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- libucxx==0.42.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- pre-commit
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ dependencies:
- gcc_linux-64=11.*
- graphviz
- ipython
- joblib>=0.11
- libcublas-dev
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- libucxx==0.42.*,>=0.0.0a0
- nccl>=2.19
- ninja
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- pre-commit
Expand Down
4 changes: 1 addition & 3 deletions conda/recipes/pylibraft/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

# Usage:
# conda build . -c conda-forge -c numba -c rapidsai -c pytorch
{% 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 @@ -81,5 +79,5 @@ tests:
about:
home: https://rapids.ai/
license: Apache-2.0
# license_file: LICENSE
license_file: LICENSE
summary: pylibraft library
5 changes: 1 addition & 4 deletions conda/recipes/raft-dask/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

# Usage:
# conda build . -c conda-forge -c numba -c rapidsai -c pytorch
{% 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 @@ -70,7 +68,6 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- dask-cuda ={{ minor_version }}
- rapids-dask-dependency ={{ minor_version }}
- joblib >=0.11
- nccl {{ nccl_version }}
- pylibraft {{ version }}
- python x.x
Expand All @@ -87,5 +84,5 @@ tests:
about:
home: https://rapids.ai/
license: Apache-2.0
# license_file: LICENSE
license_file: LICENSE
summary: raft-dask library
4 changes: 0 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,6 @@ dependencies:
- output_types: [conda, pyproject]
packages:
- dask-cuda==25.2.*,>=0.0.0a0
- joblib>=0.11
- numba>=0.57
- rapids-dask-dependency==25.2.*,>=0.0.0a0
- output_types: conda
packages:
Expand All @@ -402,7 +400,6 @@ dependencies:
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
# This index is needed for cudf and rmm.
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
Expand Down Expand Up @@ -482,7 +479,6 @@ dependencies:
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
# This index is needed for rmm-cu{11,12}.
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ exclude = [
skip = "./.git,./.github,./cpp/build,.*egg-info.*,./.mypy_cache,.*_skbuild"
# ignore short words, and typename parameters like OffsetT
ignore-regex = "\\b(.{1,4}|[A-Z]\\w*T)\\b"
ignore-words-list = "inout,numer"
ignore-words-list = "inout,unparseable,numer"
builtin = "clear"
quiet-level = 3
38 changes: 0 additions & 38 deletions python/pylibraft/setup.cfg

This file was deleted.

2 changes: 0 additions & 2 deletions python/raft-dask/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ requires-python = ">=3.10"
dependencies = [
"dask-cuda==25.2.*,>=0.0.0a0",
"distributed-ucxx==0.42.*,>=0.0.0a0",
"joblib>=0.11",
"numba>=0.57",
"pylibraft==25.2.*,>=0.0.0a0",
"rapids-dask-dependency==25.2.*,>=0.0.0a0",
"ucx-py==0.42.*,>=0.0.0a0",
Expand Down
55 changes: 0 additions & 55 deletions setup.cfg

This file was deleted.

Loading