-
Notifications
You must be signed in to change notification settings - Fork 192
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.
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
Use rapids-build-backend. #1502
Merged
rapids-bot
merged 81 commits into
rapidsai:branch-24.08
from
bdice:rapids_build_backend
May 24, 2024
Merged
Changes from all commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
8ffedf2
Use rapids-build-backend.
bdice f5e6177
Update dependencies.
bdice 008b20c
Use build module.
bdice 2d4c846
Fix pyproject.toml.
bdice ab0b17a
Fix key.
bdice 0a2e648
Read GIT_COMMIT.
bdice 697f340
Merge branch 'branch-24.04' into rapids_build_backend
bdice 10ccd85
Install rapids-build-backend.
bdice f29fa7a
Merge branch 'rapids_build_backend' of github.com:bdice/rmm into rapi…
bdice 952dedc
Fix build-system.requires until packages are available.
bdice 1301e60
Update for changes in rapids-build-backend.
bdice e4a5abf
Use pip wheel for wheel builds to find it during installation.
bdice ee87798
Fix scikit-build-core to include pyproject extras.
bdice 8c9c4df
Add dependency on rapids-build-backend.
bdice 747a28c
Remove testing hacks now that packages are available.
bdice 8a28056
Merge remote-tracking branch 'upstream/branch-24.06' into rapids_buil…
bdice 9def158
Update conda recipe.
bdice ee886d5
Add rapidsai-nightly to dependencies.yaml.
bdice ba766dd
merge latest branch-24.06
jameslamb 92949db
fix link in README
jameslamb 6766df2
add pyproject_dir
jameslamb 5812808
Merge branch 'rapids_build_backend' of github.com:bdice/rmm into rapi…
jameslamb b049e8f
go all the way to the latest dfg
jameslamb 8a6e4c4
get rapids-build-backend from github
jameslamb f0caeac
update scripts
jameslamb 0a5919f
fix path
jameslamb ea2d856
revert changes from local debugging
jameslamb 5e94960
paths
jameslamb b62e232
fix installation in conda build
jameslamb a310550
remove duplicate cloning
jameslamb 0ca672f
revert more stuff from local testing
jameslamb 4455d9a
merge latest changes
jameslamb 714f572
thank you rapids-dependency-file-generator, for putting my dependenci…
jameslamb 9743105
the C++ wheels and Python wheels both need a scikit-build-core dep, b…
jameslamb 352731c
adjust to presence of cpp wheels
jameslamb 4554a7e
maybe you need to point at a dependencies.yaml for the suffix-adding …
jameslamb 793d2ac
Merge branch 'branch-24.06' of github.com:rapidsai/rmm into rapids_bu…
jameslamb 31fcf91
remove fallback librmm requirement
jameslamb 535ecab
copyright updates
jameslamb 7e0988e
add alpha specs
jameslamb b212f9b
Merge branch 'branch-24.06' into rapids_build_backend
jameslamb eed5625
get better logs, comment out conda jobs
jameslamb c291130
get even more logs
jameslamb a4c1b4f
use upstream rapids-build-backend
jameslamb 20c98e8
fix rapids-build-backend installation
jameslamb 1c78f07
move pin to dependencies.yaml
jameslamb 9791fef
fix copyrights
jameslamb 5ade208
fix pin
jameslamb f57e124
uncomment more CI
jameslamb 3be15c6
remove conditions
jameslamb 09a0b3b
fix rbb installation in conda and devcontainers
jameslamb 7865d55
Merge branch 'branch-24.06' into rapids_build_backend
jameslamb f5eddbb
remove cuda-python rewriting
jameslamb 2a6b7d5
make GIT_COMMIT stricter
jameslamb 3190d98
Merge branch 'branch-24.06' of github.com:rapidsai/rmm into rapids_bu…
jameslamb b3bb256
make _version.py more generic
jameslamb c6d5a78
use rapids-build-backend packages
jameslamb 620ccd4
copyright
jameslamb ae80cb4
fix version specifier for conda
jameslamb 58f418f
librmm wheel too
jameslamb 7569d4d
Merge branch 'branch-24.06' into rapids_build_backend
jameslamb 3c40558
update to latest branch-24.06, move test
jameslamb 294f7db
revert testing changes
jameslamb 0494363
Merge branch 'branch-24.06' of github.com:rapidsai/rmm into rapids_bu…
jameslamb a507ae1
add ceiling on rapids-build-backend
jameslamb dcba4c2
and the conda recipe
jameslamb efc5a61
Merge branch 'branch-24.06' of github.com:rapidsai/rmm into rapids_bu…
jameslamb dd51662
use rapids-build-backend 0.2.0
jameslamb 4965a44
more copyright
jameslamb 92b7133
Revert "more copyright"
jameslamb 3374f01
Revert "use rapids-build-backend 0.2.0"
jameslamb d5d2052
use rapids-build-backend 0.2.0
jameslamb 8fb02bc
Merge branch 'branch-24.06' into rapids_build_backend
jameslamb 940d86f
merge branch-24.08
jameslamb 32f623f
Merge branch 'branch-24.08' into rapids_build_backend
jameslamb c6e522c
upgrade to v0.3.0, consolidate rapids-generate-version uses
jameslamb cc76e35
rapids-dependency-file-generator version
jameslamb b9a31fb
populate __all__ in _version.py
jameslamb 4aab1c3
set 'rapidsai.disable-cuda=true' in conda builds
jameslamb 7aeba94
standardize rapids-build-backend version constraint, revert build_cpp…
jameslamb 1a9b4f1
--config-settings, not --config-setting, for pip
jameslamb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,13 +13,9 @@ | |
# limitations under the License. | ||
|
||
[build-system] | ||
build-backend = "scikit_build_core.build" | ||
build-backend = "rapids_build_backend.build" | ||
requires = [ | ||
"cmake>=3.26.4", | ||
"cuda-python>=11.7.1,<12.0a0", | ||
"cython>=3.0.0", | ||
"librmm==24.8.*", | ||
"ninja", | ||
"rapids-build-backend>=0.3.0,<0.4.0.dev0", | ||
"scikit-build-core[pyproject]>=0.7.0", | ||
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. | ||
|
||
|
@@ -125,6 +121,18 @@ provider = "scikit_build_core.metadata.regex" | |
input = "rmm/VERSION" | ||
regex = "(?P<value>.*)" | ||
|
||
[tool.rapids-build-backend] | ||
build-backend = "scikit_build_core.build" | ||
commit-file = "rmm/GIT_COMMIT" | ||
dependencies-file = "../../dependencies.yaml" | ||
requires = [ | ||
"cmake>=3.26.4", | ||
"cuda-python>=11.7.1,<12.0a0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. At some point I'd like to consider switching the "default" pyproject.toml to CUDA 12. That can be evaluated later but if we like the idea we could file a build-planning issue. |
||
"cython>=3.0.0", | ||
"librmm==24.8.*,>=0.0.0a0", | ||
"ninja", | ||
] # 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] | ||
# treat warnings as errors | ||
filterwarnings = [ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# Copyright (c) 2024, NVIDIA CORPORATION. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import rmm | ||
|
||
|
||
def test_version_constants_are_populated(): | ||
# __git_commit__ will only be non-empty in a built distribution | ||
assert isinstance(rmm.__git_commit__, str) | ||
|
||
# __version__ should always be non-empty | ||
assert isinstance(rmm.__version__, str) | ||
assert len(rmm.__version__) > 0 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just pushed one more change... remembered that
pip
accepts--config-settings
(with ans
), not--config-setting
.https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-C
Having
--config-setting
(nos
) didn't break anything in CI or even display any warnings, so maybe newer versions ofpip
have code to capture both. But either way, I think--config-settings
(with thes
) is the right thing forpip install
, given that's what is in that tool's docs.I'll apply that change to the
cudf
PR. cc @KyleFromNVIDIA that should be applied to the otherrapids-build-backend
PRs as well.