From 88f1a6722e48518069bf76f7729a28cfc2310bec Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Dec 2024 14:21:43 -0600 Subject: [PATCH] remove unused 'joblib' and 'numba' dependencies, other packaging cleanup --- .pre-commit-config.yaml | 3 +- .../all_cuda-118_arch-aarch64.yaml | 2 - .../all_cuda-118_arch-x86_64.yaml | 2 - .../all_cuda-125_arch-aarch64.yaml | 2 - .../all_cuda-125_arch-x86_64.yaml | 2 - conda/recipes/pylibraft/meta.yaml | 4 +- conda/recipes/raft-dask/meta.yaml | 5 +- dependencies.yaml | 4 -- pyproject.toml | 2 +- python/pylibraft/setup.cfg | 38 ------------- python/raft-dask/pyproject.toml | 2 - setup.cfg | 55 ------------------- 12 files changed, 4 insertions(+), 117 deletions(-) delete mode 100644 python/pylibraft/setup.cfg delete mode 100644 setup.cfg diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e3b3c8c440..d5456ba30b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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/| diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index e145aeb92e..793ca8dc67 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -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 @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 75dcffa95d..a9f839bd03 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 @@ -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 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index bfa32c80d1..9d7286bb8e 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -27,7 +27,6 @@ dependencies: - gcc_linux-aarch64=11.* - graphviz - ipython -- joblib>=0.11 - libcublas-dev - libcurand-dev - libcusolver-dev @@ -35,7 +34,6 @@ dependencies: - libucxx==0.42.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numba>=0.57 - numpy>=1.23,<3.0a0 - numpydoc - pre-commit diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 98ec334635..e4ec074ae5 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -27,7 +27,6 @@ dependencies: - gcc_linux-64=11.* - graphviz - ipython -- joblib>=0.11 - libcublas-dev - libcurand-dev - libcusolver-dev @@ -35,7 +34,6 @@ dependencies: - libucxx==0.42.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numba>=0.57 - numpy>=1.23,<3.0a0 - numpydoc - pre-commit diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index 4a8ed29c85..0b57432402 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -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'] %} @@ -81,5 +79,5 @@ tests: about: home: https://rapids.ai/ license: Apache-2.0 - # license_file: LICENSE + license_file: LICENSE summary: pylibraft library diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index a8be273f82..19155166af 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -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'] %} @@ -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 @@ -87,5 +84,5 @@ tests: about: home: https://rapids.ai/ license: Apache-2.0 - # license_file: LICENSE + license_file: LICENSE summary: raft-dask library diff --git a/dependencies.yaml b/dependencies.yaml index dc1807fbf9..689cf8414c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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: @@ -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: @@ -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: diff --git a/pyproject.toml b/pyproject.toml index 5042113388..2f23debfbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 diff --git a/python/pylibraft/setup.cfg b/python/pylibraft/setup.cfg deleted file mode 100644 index 7d1a0c9065..0000000000 --- a/python/pylibraft/setup.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. - -[isort] -line_length=79 -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -combine_as_imports=True -order_by_type=True -known_dask= - dask - distributed - dask_cuda -known_rapids= - nvtext - cudf - cuml - cugraph - dask_cudf - rmm -known_first_party= - raft - pylibraft -default_section=THIRDPARTY -sections=FUTURE,STDLIB,THIRDPARTY,DASK,RAPIDS,FIRSTPARTY,LOCALFOLDER -skip= - thirdparty - .eggs - .git - .hg - .mypy_cache - .tox - .venv - _build - buck-out - build - dist - __init__.py diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 33643c481e..cabe8e72a6 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -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", diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 94140d4d00..0000000000 --- a/setup.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. - -[flake8] -filename = *.py, *.pyx, *.pxd, *.pxi -exclude = __init__.py, *.egg, build, docs, .git -force-check = True -ignore = - # line break before binary operator - W503, - # whitespace before : - E203 -per-file-ignores = - # Rules ignored only in Cython: - # E211: whitespace before '(' (used in multi-line imports) - # E225: Missing whitespace around operators (breaks cython casting syntax like ) - # E226: Missing whitespace around arithmetic operators (breaks cython pointer syntax like int*) - # E227: Missing whitespace around bitwise or shift operator (Can also break casting syntax) - # E275: Missing whitespace after keyword (Doesn't work with Cython except?) - # E402: invalid syntax (works for Python, not Cython) - # E999: invalid syntax (works for Python, not Cython) - # W504: line break after binary operator (breaks lines that end with a pointer) - *.pyx: E211, E225, E226, E227, E275, E402, E999, W504 - *.pxd: E211, E225, E226, E227, E275, E402, E999, W504 - *.pxi: E211, E225, E226, E227, E275, E402, E999, W504 - -[pydocstyle] -# Due to https://github.com/PyCQA/pydocstyle/issues/363, we must exclude rather -# than include using match-dir. Note that as discussed in -# https://stackoverflow.com/questions/65478393/how-to-filter-directories-using-the-match-dir-flag-for-pydocstyle, -# unlike the match option above this match-dir will have no effect when -# pydocstyle is invoked from pre-commit. Therefore this exclusion list must -# also be maintained in the pre-commit config file. -match-dir = ^(?!(ci|cpp|conda|docs)).*$ -# Allow missing docstrings for docutils -ignore-decorators = .*(docutils|doc_apply|copy_docstring).* -select = - D201, D204, D206, D207, D208, D209, D210, D211, D214, D215, D300, D301, D302, D403, D405, D406, D407, D408, D409, D410, D411, D412, D414, D418 - # Would like to enable the following rules in the future: - # D200, D202, D205, D400 - -[mypy] -ignore_missing_imports = True -# If we don't specify this, then mypy will check excluded files if -# they are imported by a checked file. -follow_imports = skip - -[codespell] -# note: pre-commit passes explicit lists of files here, which this skip file list doesn't override - -# this is only to allow you to run codespell interactively -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,unparseable,numer -builtin = clear -quiet-level = 3