Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version #4597

Merged
merged 11 commits into from
Aug 9, 2024
Merged

Use tool.scikit-build.cmake.version, set scikit-build-core minimum-version #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
851e548
Use tool.scikit-build.cmake.version, set scikit-build-core minimum-ve…
jameslamb Aug 6, 2024
2c3f9d8
merge 24.10
jameslamb Aug 7, 2024
cc0d386
Merge branch 'branch-24.08' of github.com:rapidsai/cugraph into sciki…
jameslamb Aug 7, 2024
cdc87a4
use build-system.requires
jameslamb Aug 7, 2024
8e2c4ca
Revert "use build-system.requires"
jameslamb Aug 7, 2024
a4687ec
Revert "Merge branch 'branch-24.08' of github.com:rapidsai/cugraph in…
jameslamb Aug 7, 2024
6302522
ok, use build-system.requires again
jameslamb Aug 7, 2024
c629ffe
Merge branch 'branch-24.10' of github.com:rapidsai/cugraph into sciki…
jameslamb Aug 7, 2024
d5c5ffe
more fixing bad merge of 24.08
jameslamb Aug 7, 2024
9db2a9c
Merge branch 'branch-24.10' into scikit-build-core-version
jameslamb Aug 8, 2024
bb2099f
Merge branch 'branch-24.10' into scikit-build-core-version
jameslamb Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading