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

cuproj: depend on librmm, not rmm #1448

Merged
merged 1 commit into from
Aug 29, 2024
Merged

cuproj: depend on librmm, not rmm #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions conda/recipes/cuproj/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ requirements:
- cython >=3.0.0
- python
- rapids-build-backend >=0.3.0,<0.4.0.dev0
- rmm ={{ minor_version }}
- librmm ={{ minor_version }}
- scikit-build-core >=0.10.0
- proj
- sqlite
Expand All @@ -74,17 +74,11 @@ requirements:
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- python
- rmm ={{ minor_version }}
- cupy>=12.0.0

test: # [linux64]
imports: # [linux64]
- cuproj # [linux64]
requires:
- cupy>=12.0.0
- cuspatial ={{ minor_version }}
- rmm ={{ minor_version }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cuproj's tests do use cuspatial, but those tests aren't run during conda builds. The only test being run here is import cuproj, which shouldn't need any additional test-specific dependencies (if it did, that might indicate a missing run: dependency!).



about:
home: https://rapids.ai/
Expand Down
6 changes: 2 additions & 4 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,16 @@ files:
table: tool.rapids-build-backend
key: requires
includes:
- depends_on_rmm
- build_cpp_cuproj
- build_python
- build_wheels
- depends_on_librmm
py_run_cuproj:
output: [pyproject]
pyproject_dir: python/cuproj
extras:
table: project
includes:
- depends_on_rmm
- depends_on_cupy
py_test_cuproj:
output: [pyproject]
Expand Down Expand Up @@ -193,7 +192,6 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- &librmm_unsuffixed librmm==24.10.*,>=0.0.0a0
- proj
- sqlite
specific:
Expand Down Expand Up @@ -556,7 +554,7 @@ dependencies:
common:
- output_types: conda
packages:
- *librmm_unsuffixed
- &librmm_unsuffixed librmm==24.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand Down
3 changes: 1 addition & 2 deletions python/cuproj/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.10"
dependencies = [
"cupy-cuda11x>=12.0.0",
"rmm==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
"Intended Audience :: Developers",
Expand Down Expand Up @@ -122,7 +121,7 @@ matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cython>=3.0.0",
"librmm==24.10.*,>=0.0.0a0",
"ninja",
"rmm==24.10.*,>=0.0.0a0",
"wheel",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Loading