-
Notifications
You must be signed in to change notification settings - Fork 152
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
rearrange dependencies.yaml, fix development instructions #1451
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -18,11 +18,9 @@ files: | |||||||||||
- depends_on_cuml | ||||||||||||
- depends_on_cupy | ||||||||||||
- depends_on_libcudf | ||||||||||||
- depends_on_libcuspatial | ||||||||||||
- depends_on_librmm | ||||||||||||
- rapids_build_skbuild | ||||||||||||
- run_python_cuspatial | ||||||||||||
- test_libcuspatial | ||||||||||||
- test_notebooks | ||||||||||||
- test_python_cuspatial | ||||||||||||
- test_python_cuproj | ||||||||||||
|
@@ -37,21 +35,21 @@ files: | |||||||||||
output: none | ||||||||||||
includes: | ||||||||||||
- cuda_version | ||||||||||||
- depends_on_libcuspatial | ||||||||||||
- depends_on_cuproj | ||||||||||||
- depends_on_cuspatial | ||||||||||||
- py_version | ||||||||||||
- test_python_cuspatial | ||||||||||||
- test_python_cuproj | ||||||||||||
- test_cuspatial | ||||||||||||
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. Notice that here, I've taken a list that previously contained That's intentional.... this Lines 13 to 17 in 1544e7b
Omitting |
||||||||||||
test_notebooks: | ||||||||||||
output: none | ||||||||||||
includes: | ||||||||||||
- cuda_version | ||||||||||||
- depends_on_cuml | ||||||||||||
- depends_on_libcuspatial | ||||||||||||
- depends_on_cuproj | ||||||||||||
- depends_on_cuspatial | ||||||||||||
- test_notebooks | ||||||||||||
- notebooks | ||||||||||||
- py_version | ||||||||||||
- test_cuspatial | ||||||||||||
checks: | ||||||||||||
output: none | ||||||||||||
includes: | ||||||||||||
|
@@ -61,10 +59,10 @@ files: | |||||||||||
output: none | ||||||||||||
includes: | ||||||||||||
- cuda_version | ||||||||||||
- depends_on_libcuspatial | ||||||||||||
- depends_on_cuspatial | ||||||||||||
- depends_on_cuproj | ||||||||||||
- docs | ||||||||||||
- py_version | ||||||||||||
- test_cuspatial | ||||||||||||
py_build_libcuspatial: | ||||||||||||
output: [pyproject] | ||||||||||||
pyproject_dir: python/libcuspatial | ||||||||||||
|
@@ -165,7 +163,6 @@ files: | |||||||||||
includes: | ||||||||||||
- test_python_cuproj | ||||||||||||
- depends_on_cuspatial | ||||||||||||
- test_cuspatial | ||||||||||||
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. This section populates the The |
||||||||||||
|
||||||||||||
channels: | ||||||||||||
- rapidsai | ||||||||||||
|
@@ -551,6 +548,31 @@ dependencies: | |||||||||||
- cuspatial-cu11==24.10.*,>=0.0.0a0 | ||||||||||||
- {matrix: null, packages: [*cuspatial_unsuffixed]} | ||||||||||||
|
||||||||||||
depends_on_cuproj: | ||||||||||||
common: | ||||||||||||
- output_types: conda | ||||||||||||
packages: | ||||||||||||
- &cuproj_unsuffixed cuproj==24.10.*,>=0.0.0a0 | ||||||||||||
- output_types: requirements | ||||||||||||
packages: | ||||||||||||
# pip recognizes the index as a global option for the requirements.txt file | ||||||||||||
- --extra-index-url=https://pypi.nvidia.com | ||||||||||||
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple | ||||||||||||
specific: | ||||||||||||
- output_types: [requirements, pyproject] | ||||||||||||
matrices: | ||||||||||||
- matrix: | ||||||||||||
cuda: "12.*" | ||||||||||||
cuda_suffixed: "true" | ||||||||||||
packages: | ||||||||||||
- cuproj-cu12==24.10.*,>=0.0.0a0 | ||||||||||||
- matrix: | ||||||||||||
cuda: "11.*" | ||||||||||||
cuda_suffixed: "true" | ||||||||||||
packages: | ||||||||||||
- cuproj-cu11==24.10.*,>=0.0.0a0 | ||||||||||||
- {matrix: null, packages: [*cuproj_unsuffixed]} | ||||||||||||
|
||||||||||||
depends_on_cupy: | ||||||||||||
common: | ||||||||||||
- output_types: conda | ||||||||||||
|
@@ -573,13 +595,6 @@ dependencies: | |||||||||||
- output_types: conda | ||||||||||||
packages: | ||||||||||||
- libcuspatial-tests==24.10.*,>=0.0.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. I’m not sure if I like this structure where we have a dependency list that defines libcuspatial-tests. In libcudf tests we list the libcudf-tests package explicitly rather than using a dependency list. https://github.com/rapidsai/cudf/blob/7018a33be752da9363db5431560d8d12bf378920/ci/test_cpp_common.sh#L34 The *-tests conda packages are kind of special in that they are only CI artifacts and thus never available from any “proper” conda channels, only local channels of CI built artifacts. For that reason I am hesitant to use RDFG to define them 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. Hmmmm. The alternate proposal I had in mind (removing the test_libcuspatial dependency list and installing libcuspatial-tests manually) would not make sense for this repo, since we’ve moved to the “single step solve” for C++ tests in cuspatial. Line 17 in 0e9d36c
Maybe we do have the right approach and no changes are needed… 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. yep exactly, the use of that |
||||||||||||
test_cuspatial: | ||||||||||||
common: | ||||||||||||
- output_types: conda | ||||||||||||
packages: | ||||||||||||
- cuspatial==24.10.*,>=0.0.0a0 | ||||||||||||
- cuproj==24.10.*,>=0.0.0a0 | ||||||||||||
|
||||||||||||
depends_on_libcuspatial: | ||||||||||||
common: | ||||||||||||
- output_types: conda | ||||||||||||
|
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.
See the build instructions in the development docs:
cuspatial/docs/source/developer_guide/build.md
Lines 15 to 32 in 1544e7b
conda/environments
libcuspatial
and its tests from sourceThose steps are currently broken.
The
libcuspatial-tests
conda package is not distributed anywhere, so that env creation will fail like this:Here, I'm recommending dropping those packages from these files. Similar to how for example you won't find e.g.
libcuml
in these files in thecuml
repo (code link) orlibcuml
in thecudf
repo (code link).