From a0bb265be07f60a61c5259ddeeb3a100b9731575 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 11 Feb 2025 02:35:26 +0000 Subject: [PATCH] Make sure rapids-logger is specified as a dependency everywhere --- conda/environments/all_cuda-118_arch-aarch64.yaml | 1 + conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-128_arch-aarch64.yaml | 1 + conda/environments/all_cuda-128_arch-x86_64.yaml | 1 + conda/recipes/libraft/meta.yaml | 2 ++ dependencies.yaml | 12 ++++++++++++ python/libraft/pyproject.toml | 2 ++ 7 files changed, 20 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 8c369e2246..2cf400550f 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -47,6 +47,7 @@ dependencies: - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==25.4.*,>=0.0.0a0 +- rapids-logger==0.1.*,>=0.0.0a0 - recommonmark - rmm==25.4.*,>=0.0.0a0 - scikit-build-core>=0.10.0 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c96f1def45..9aa9e4ef62 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -47,6 +47,7 @@ dependencies: - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==25.4.*,>=0.0.0a0 +- rapids-logger==0.1.*,>=0.0.0a0 - recommonmark - rmm==25.4.*,>=0.0.0a0 - scikit-build-core>=0.10.0 diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml index 5d51fa00d5..f180b766b3 100644 --- a/conda/environments/all_cuda-128_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -43,6 +43,7 @@ dependencies: - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==25.4.*,>=0.0.0a0 +- rapids-logger==0.1.*,>=0.0.0a0 - recommonmark - rmm==25.4.*,>=0.0.0a0 - scikit-build-core>=0.10.0 diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 097d7bcdc0..a098636ea6 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -43,6 +43,7 @@ dependencies: - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==25.4.*,>=0.0.0a0 +- rapids-logger==0.1.*,>=0.0.0a0 - recommonmark - rmm==25.4.*,>=0.0.0a0 - scikit-build-core>=0.10.0 diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 5fbf8a4fd1..9faa7b84ee 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -63,6 +63,7 @@ outputs: - cuda-cudart-dev {% endif %} - librmm ={{ minor_version }} + - rapids-logger =0.1 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} @@ -71,6 +72,7 @@ outputs: - cuda-cudart {% endif %} - librmm ={{ minor_version }} + - rapids-logger =0.1 about: home: https://rapids.ai/ license: Apache-2.0 diff --git a/dependencies.yaml b/dependencies.yaml index 2eaad85b7a..225103391f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -15,6 +15,7 @@ files: - depends_on_cupy - depends_on_distributed_ucxx - depends_on_rmm + - depends_on_rapids_logger - develop - docs - rapids_build_skbuild @@ -65,6 +66,7 @@ files: includes: - build_common - depends_on_librmm + - depends_on_rapids_logger py_run_libraft: output: pyproject pyproject_dir: python/libraft @@ -73,6 +75,7 @@ files: includes: - cuda_wheels - depends_on_librmm + - depends_on_rapids_logger py_build_pylibraft: output: pyproject pyproject_dir: python/pylibraft @@ -400,6 +403,15 @@ dependencies: - cupy-cuda11x>=12.0.0 - {matrix: null, packages: [cupy-cuda11x>=12.0.0]} + depends_on_rapids_logger: + common: + - output_types: [conda, requirements, pyproject] + packages: + - rapids-logger==0.1.*,>=0.0.0a0 + - output_types: requirements + packages: + # pip recognizes the index as a global option for the requirements.txt file + - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple test_libraft: common: - output_types: [conda] diff --git a/python/libraft/pyproject.toml b/python/libraft/pyproject.toml index 517b353fad..8ef419282c 100644 --- a/python/libraft/pyproject.toml +++ b/python/libraft/pyproject.toml @@ -36,6 +36,7 @@ dependencies = [ "nvidia-curand", "nvidia-cusolver", "nvidia-cusparse", + "rapids-logger==0.1.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", @@ -105,6 +106,7 @@ requires = [ "cmake>=3.26.4,!=3.30.0", "librmm==25.4.*,>=0.0.0a0", "ninja", + "rapids-logger==0.1.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. dependencies-file = "../../dependencies.yaml" matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"