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

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:
  - Mike Sarahan (https://github.com/msarahan)

URL: #4597
  • Loading branch information
jameslamb authored Aug 9, 2024
1 parent d92c257 commit f935e76
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 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 @@ -64,7 +64,7 @@ dependencies:
- recommonmark
- requests
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn>=0.23.1
- scipy
- setuptools>=61.0.0
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 @@ -69,7 +69,7 @@ dependencies:
- recommonmark
- requests
- rmm==24.10.*,>=0.0.0a0
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- scikit-learn>=0.23.1
- scipy
- setuptools>=61.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ requirements:
- python
- raft-dask ={{ minor_version }}
- rmm ={{ minor_version }}
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
run:
- aiohttp
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/pylibcugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ requirements:
- libcugraph ={{ version }}
- pylibraft ={{ minor_version }}
- python
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,10 @@ dependencies:
- cython>=3.0.0
- output_types: conda
packages:
- scikit-build-core>=0.7.0
- scikit-build-core>=0.10.0
- output_types: [pyproject, requirements]
packages:
- scikit-build-core[pyproject]>=0.7.0
- scikit-build-core[pyproject]>=0.10.0
python_run_cugraph:
common:
- output_types: [conda, pyproject]
Expand Down
5 changes: 3 additions & 2 deletions python/cugraph/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
requires = [
"cython>=3.0.0",
"rapids-build-backend>=0.3.1,<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 @@ -66,7 +66,8 @@ Documentation = "https://docs.rapids.ai/api/cugraph/stable/"
[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.reproducible = true
wheel.packages = ["cugraph"]
Expand Down
5 changes: 3 additions & 2 deletions python/pylibcugraph/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
requires = [
"cython>=3.0.0",
"rapids-build-backend>=0.3.1,<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 @@ -53,7 +53,8 @@ Documentation = "https://docs.rapids.ai/api/cugraph/stable/"
[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.reproducible = true
wheel.packages = ["pylibcugraph"]
Expand Down

0 comments on commit f935e76

Please sign in to comment.