Skip to content

Commit

Permalink
Use tool.scikit-build.cmake.version (#1637)
Browse files Browse the repository at this point in the history
`cmake.minimum-version` has been deprecated since `scikit-build-core` 0.8, and is now causing conflicts in 0.10 due to its attempts to auto-detect `cmake.version` from `CMakeLists.txt`. Bump the minimum `scikit-build-core` to 0.10 and use the suggested `cmake.version`.

Contributes to rapidsai/build-planning#58

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - James Lamb (https://github.com/jameslamb)
  - https://github.com/jakirkham

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - https://github.com/jakirkham

URL: #1637
  • Loading branch information
KyleFromNVIDIA authored Aug 8, 2024
1 parent 203c904 commit 8336979
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 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 @@ -34,7 +34,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- spdlog>=1.12.0,<1.13
- sphinx
- 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 @@ -33,7 +33,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
- spdlog>=1.12.0,<1.13
- sphinx
- sphinx-copybutton
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/rmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ requirements:
- rapids-build-backend >=0.3.0,<0.4.0.dev0
- librmm ={{ version }}
- python
- scikit-build-core >=0.7.0
- scikit-build-core >=0.10.0
run:
{% if cuda_major == "11" %}
- cudatoolkit
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,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
build:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
5 changes: 3 additions & 2 deletions python/librmm/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`.

[project]
Expand Down Expand Up @@ -55,7 +55,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.reproducible = true
wheel.packages = ["librmm"]
Expand Down
5 changes: 3 additions & 2 deletions python/rmm/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`.

[project]
Expand Down Expand Up @@ -110,7 +110,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 8336979

Please sign in to comment.