FIX scikit-build-core and other small wheel dependencies that I forgo…

…t to checkin before
rapidsai · Mar 1, 2024 · bda4f82 · bda4f82
1 parent e11cfb4
commit bda4f82
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -41,11 +41,12 @@ dependencies:
 - nvcc_linux-aarch64=11.8
 - pre-commit
 - pydata-sphinx-theme
+- pylibraft==24.2.*
 - pytest
 - pytest-cov
 - recommonmark
 - rmm==24.2.*
-- scikit-build>=0.13.1
+- scikit-build-core[pyproject]>=0.7.0
 - scikit-learn
 - scipy
 - sphinx-copybutton

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -41,11 +41,12 @@ dependencies:
 - nvcc_linux-64=11.8
 - pre-commit
 - pydata-sphinx-theme
+- pylibraft==24.2.*
 - pytest
 - pytest-cov
 - recommonmark
 - rmm==24.2.*
-- scikit-build>=0.13.1
+- scikit-build-core[pyproject]>=0.7.0
 - scikit-learn
 - scipy
 - sphinx-copybutton

diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml
@@ -37,11 +37,12 @@ dependencies:
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
+- pylibraft==24.2.*
 - pytest
 - pytest-cov
 - recommonmark
 - rmm==24.2.*
-- scikit-build>=0.13.1
+- scikit-build-core[pyproject]>=0.7.0
 - scikit-learn
 - scipy
 - sphinx-copybutton

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -37,11 +37,12 @@ dependencies:
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
+- pylibraft==24.2.*
 - pytest
 - pytest-cov
 - recommonmark
 - rmm==24.2.*
-- scikit-build>=0.13.1
+- scikit-build-core[pyproject]>=0.7.0
 - scikit-learn
 - scipy
 - sphinx-copybutton

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -84,7 +84,7 @@ dependencies:
           - &cmake_ver cmake>=3.26.4
           - cython>=3.0.0
           - ninja
-          - scikit-build>=0.13.1
+          - "scikit-build-core[pyproject]>=0.7.0"
       - output_types: [conda]
         packages:
           - c-compiler
@@ -129,6 +129,7 @@ dependencies:
       - output_types: [conda]
         packages:
           - &rmm_conda rmm==24.2.*
+          - &pylibraft_conda pylibraft==24.2.*
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
@@ -149,15 +150,17 @@ dependencies:
           - matrix: {cuda: "12.2"}
             packages: &build_cuvs_packages_cu12
               - &rmm_cu12 rmm-cu12==24.2.*
+              - &pylibraft_cu12 pylibraft-cu12==24.2.*
           - {matrix: {cuda: "12.1"}, packages: *build_cuvs_packages_cu12}
           - {matrix: {cuda: "12.0"}, packages: *build_cuvs_packages_cu12}
           - matrix: {cuda: "11.8"}
             packages: &build_cuvs_packages_cu11
               - &rmm_cu11 rmm-cu11==24.2.*
+              - &pylibraft_cu11 pylibraft-cu11==24.2.*
           - {matrix: {cuda: "11.5"}, packages: *build_cuvs_packages_cu11}
           - {matrix: {cuda: "11.4"}, packages: *build_cuvs_packages_cu11}
           - {matrix: {cuda: "11.2"}, packages: *build_cuvs_packages_cu11}
-          - {matrix: null, packages: [*rmm_conda] }
+          - {matrix: null, packages: [*rmm_conda, *pylibraft_conda] }
   checks:
     common:
       - output_types: [conda, requirements]
@@ -334,6 +337,7 @@ dependencies:
       - output_types: [conda]
         packages:
           - *rmm_conda
+          - *pylibraft_conda
       - output_types: requirements
         packages:
           # pip recognizes the index as a global option for the requirements.txt file
@@ -354,15 +358,17 @@ dependencies:
           - matrix: {cuda: "12.2"}
             packages: &run_cuvs_packages_cu12
               - *rmm_cu12
+              - *pylibraft_cu12
           - {matrix: {cuda: "12.1"}, packages: *run_cuvs_packages_cu12}
           - {matrix: {cuda: "12.0"}, packages: *run_cuvs_packages_cu12}
           - matrix: {cuda: "11.8"}
             packages: &run_cuvs_packages_cu11
               - *rmm_cu11
+              - *pylibraft_cu12
           - {matrix: {cuda: "11.5"}, packages: *run_cuvs_packages_cu11}
           - {matrix: {cuda: "11.4"}, packages: *run_cuvs_packages_cu11}
           - {matrix: {cuda: "11.2"}, packages: *run_cuvs_packages_cu11}
-          - {matrix: null, packages: [*rmm_conda]}
+          - {matrix: null, packages: [*rmm_conda, *pylibraft_conda]}
   test_python_common:
     common:
       - output_types: [conda, requirements, pyproject]

diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml
@@ -19,8 +19,9 @@ requires = [
     "cuda-python>=11.7.1,<12.0a0",
     "cython>=3.0.0",
     "ninja",
+    "pylibraft==24.2.*",
     "rmm==24.2.*",
-    "scikit-build>=0.13.1",
+    "scikit-build-core[pyproject]>=0.7.0",
     "setuptools",
     "wheel",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
@@ -39,6 +40,7 @@ requires-python = ">=3.9"
 dependencies = [
     "cuda-python>=11.7.1,<12.0a0",
     "numpy>=1.21",
+    "pylibraft==24.2.*",
     "rmm==24.2.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [