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 (#6012)

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)
  - Dante Gama Dessavre (https://github.com/dantegd)

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

URL: #6012
  • Loading branch information
jameslamb authored Aug 9, 2024
1 parent 19ffd6b commit 0def703
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
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 @@ -63,7 +63,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==1.5
- scipy>=1.8.0
- seaborn
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 @@ -59,7 +59,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==1.5
- scipy>=1.8.0
- seaborn
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml-cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requirements:
- ninja
host:
- python x.x
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- cython>=3.0.0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
run:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ requirements:
- pylibraft ={{ minor_version }}
- python x.x
- raft-dask ={{ minor_version }}
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- treelite {{ treelite_version }}
- rapids-build-backend>=0.3.0,<0.4.0.dev0
run:
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ dependencies:
- 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
checks:
common:
- output_types: [conda, requirements]
Expand Down
5 changes: 3 additions & 2 deletions python/cuml/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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`.

[tool.pytest.ini_options]
Expand Down Expand Up @@ -167,7 +167,8 @@ requires = [
[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 0def703

Please sign in to comment.