Skip to content

Commit

Permalink
Use tool.scikit-build.cmake.version, set scikit-build-core minimum-ve…
Browse files Browse the repository at this point in the history
…rsion (#2406)

Contributes to rapidsai/build-planning#58.

`scikit-build-core==0.10.0` was released today (https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.0), and wheel-building configurations across RAPIDS are incompatible with it.

This proposes upgrading to that version and fixing configuration here in a way that:

* is compatible with that new `scikit-build-core` version
* takes advantage of the forward-compatibility mechanism (`minimum-version`) that `scikit-build-core` provides, to reduce the risk of needing to do this again in the future

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - https://github.com/jakirkham

URL: #2406
  • Loading branch information
jameslamb authored Aug 8, 2024
1 parent dbdde82 commit a1f4844
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn
- scipy
- sphinx-copybutton
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn
- scipy
- sphinx-copybutton
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn
- scipy
- sphinx-copybutton
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn
- scipy
- sphinx-copybutton
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==24.10.*,>=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
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==24.10.*,>=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
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-120_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==24.10.*,>=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
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ dependencies:
- pyyaml
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==24.10.*,>=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
2 changes: 1 addition & 1 deletion conda/recipes/pylibraft/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/raft-dask/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
5 changes: 3 additions & 2 deletions python/pylibraft/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 = "build-system.requires"
ninja.make-fallback = true
sdist.exclude = ["*tests*"]
sdist.reproducible = true
Expand Down
5 changes: 3 additions & 2 deletions python/raft-dask/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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 = "build-system.requires"
ninja.make-fallback = true
sdist.exclude = ["*tests*"]
sdist.reproducible = true
Expand Down

0 comments on commit a1f4844

Please sign in to comment.