From 51e0168f481bb711352ccb73b5aeea9090f2a2c1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 6 Aug 2024 19:28:17 -0500 Subject: [PATCH 1/2] Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-120_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-120_arch-x86_64.yaml | 2 +- conda/recipes/pylibraft/meta.yaml | 2 +- conda/recipes/raft-dask/meta.yaml | 2 +- dependencies.yaml | 4 ++-- python/pylibraft/pyproject.toml | 5 +++-- python/raft-dask/pyproject.toml | 5 +++-- 13 files changed, 18 insertions(+), 16 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index f2ae41822c..324aabfcba 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -51,7 +51,7 @@ dependencies: - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.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 index 8f5f4d3088..175dfbbe34 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -51,7 +51,7 @@ dependencies: - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - scipy - sphinx-copybutton diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index 2042156224..b1bc2c6216 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -47,7 +47,7 @@ dependencies: - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - scipy - sphinx-copybutton diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index a2586cc211..d5ec5f9976 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -47,7 +47,7 @@ dependencies: - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - scikit-learn - scipy - sphinx-copybutton diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml index 000a8f4a1c..6799dd8d2f 100644 --- a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml @@ -41,6 +41,6 @@ dependencies: - pyyaml - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sysroot_linux-aarch64==2.17 name: bench_ann_cuda-118_arch-aarch64 diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml index 52b3a8dc69..f8e4d673ca 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -41,6 +41,6 @@ dependencies: - pyyaml - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sysroot_linux-64==2.17 name: bench_ann_cuda-118_arch-x86_64 diff --git a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml index 27baeda4b8..a88abd54ab 100644 --- a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml @@ -37,6 +37,6 @@ dependencies: - pyyaml - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sysroot_linux-aarch64==2.17 name: bench_ann_cuda-120_arch-aarch64 diff --git a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml index 5274d56bf6..b7a5ec8bfa 100644 --- a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml @@ -37,6 +37,6 @@ dependencies: - pyyaml - rapids-build-backend>=0.3.0,<0.4.0.dev0 - rmm==24.8.*,>=0.0.0a0 -- scikit-build-core>=0.7.0 +- scikit-build-core>=0.10.0 - sysroot_linux-64==2.17 name: bench_ann_cuda-120_arch-x86_64 diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index 31086e30aa..4ef85fc0e5 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -54,7 +54,7 @@ requirements: - libraft-headers {{ version }} - python x.x - rmm ={{ minor_version }} - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 641a11a241..74b26b5935 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -54,7 +54,7 @@ requirements: - pylibraft {{ version }} - python x.x - rmm ={{ minor_version }} - - scikit-build-core >=0.7.0 + - scikit-build-core >=0.10.0 - ucx-py {{ ucx_py_version }} - ucxx {{ ucxx_version }} - rapids-build-backend>=0.3.0,<0.4.0.dev0 diff --git a/dependencies.yaml b/dependencies.yaml index e1cc919d83..897ec7da3c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -154,10 +154,10 @@ dependencies: - &rapids_build_backend rapids-build-backend>=0.3.0,<0.4.0.dev0 - output_types: [conda] packages: - - scikit-build-core>=0.7.0 + - scikit-build-core>=0.10.0 - output_types: [requirements, pyproject] packages: - - scikit-build-core[pyproject]>=0.7.0 + - scikit-build-core[pyproject]>=0.10.0 rapids_build: common: - output_types: [conda, requirements, pyproject] diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index e32cf5f902..ab1cb04ff2 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -16,7 +16,7 @@ requires = [ "rapids-build-backend>=0.3.0,<0.4.0.dev0", - "scikit-build-core[pyproject]>=0.7.0", + "scikit-build-core[pyproject]>=0.10.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. build-backend = "rapids_build_backend.build" @@ -102,7 +102,8 @@ skip = [ [tool.scikit-build] build-dir = "build/{wheel_tag}" cmake.build-type = "Release" -cmake.minimum-version = "3.26.4" +cmake.version = "CMakeLists.txt" +minimum-version = "0.10" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 26a1e9ffe2..0a44b5b7d5 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -17,7 +17,7 @@ build-backend = "rapids_build_backend.build" requires = [ "rapids-build-backend>=0.3.0,<0.4.0.dev0", - "scikit-build-core[pyproject]>=0.7.0", + "scikit-build-core[pyproject]>=0.10.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project] @@ -105,7 +105,8 @@ skip = [ [tool.scikit-build] build-dir = "build/{wheel_tag}" cmake.build-type = "Release" -cmake.minimum-version = "3.26.4" +cmake.version = "CMakeLists.txt" +minimum-version = "0.10" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true From a6be0bb226b100cee4e5cd58b98e9442c2fec559 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:14:07 -0500 Subject: [PATCH 2/2] use build-system.requires --- python/pylibraft/pyproject.toml | 2 +- python/raft-dask/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index 0dfa2ee68f..4c1d8e8fa1 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -103,7 +103,7 @@ skip = [ build-dir = "build/{wheel_tag}" cmake.build-type = "Release" cmake.version = "CMakeLists.txt" -minimum-version = "0.10" +minimum-version = "build-system.requires" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index a1a5d69c86..4fadfa5c9f 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -106,7 +106,7 @@ skip = [ build-dir = "build/{wheel_tag}" cmake.build-type = "Release" cmake.version = "CMakeLists.txt" -minimum-version = "0.10" +minimum-version = "build-system.requires" ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true