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.

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

Remove proj and sqlite from libcuspatial recipe. #1308

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- numpydoc
- nvcc_linux-64=11.8
- pre-commit
- proj
- proj==9.3.0
- pydata-sphinx-theme!=0.14.2
- pydeck
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies:
- notebook
- numpydoc
- pre-commit
- proj
- proj==9.3.0
- pydata-sphinx-theme!=0.14.2
- pydeck
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuproj/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ sysroot_version:
cmake_version:
- ">=3.26.4"

# Workaround until proj 9.3.1 migration completes
# Match with dependencies.yaml, and keep in sync with the conda-forge pinning
proj:
- "9.3.0"
4 changes: 0 additions & 4 deletions conda/recipes/libcuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ requirements:
- gtest {{ gtest_version }}
- libcudf ={{ minor_version }}
- librmm ={{ minor_version }}
- sqlite
- proj

outputs:
- name: libcuspatial
Expand Down Expand Up @@ -79,8 +77,6 @@ outputs:
{% endif %}
- libcudf ={{ minor_version }}
- librmm ={{ minor_version }}
- sqlite
- proj
test:
commands:
- test -f $PREFIX/lib/libcuspatial.so
Expand Down
60 changes: 14 additions & 46 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ files:
cuda: ["11.8", "12.0"]
arch: [x86_64]
includes:
- build_cpp
- build_cpp_common
- build_cpp_cuspatial
- build_cpp_cuproj
- build_python
- cudatoolkit
- develop
Expand Down Expand Up @@ -57,7 +59,8 @@ files:
includes:
- depends_on_rmm
- depends_on_cudf
- build_cpp
- build_cpp_common
- build_cpp_cuspatial
- build_python
- build_wheels
py_run_cuspatial:
Expand All @@ -84,6 +87,7 @@ files:
table: build-system
includes:
- depends_on_rmm
- build_cpp_common
- build_cpp_cuproj
- build_python_cuproj
- build_wheels
Expand Down Expand Up @@ -111,7 +115,7 @@ channels:
- conda-forge
- nvidia
dependencies:
build_cpp:
build_cpp_common:
common:
- output_types: [conda, requirements, pyproject]
packages:
Expand All @@ -123,10 +127,7 @@ dependencies:
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- libcudf==24.2.*
- librmm==24.2.*
- proj
- sqlite
specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -157,51 +158,18 @@ dependencies:
packages:
- cuda-version=12.0
- cuda-nvcc
build_cpp_cuproj:
build_cpp_cuspatial:
common:
- output_types: [conda, requirements, pyproject]
- output_types: conda
packages:
- ninja
- cmake>=3.26.4
- libcudf==24.2.*
build_cpp_cuproj:
common:
- output_types: conda
packages:
- c-compiler
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.2.*
- proj
# Match with conda_build_config.yaml, and keep in sync with the conda-forge pinning
- proj==9.3.0
- sqlite
specific:
- output_types: conda
matrices:
- matrix:
arch: x86_64
packages:
- *gcc_amd64
- *sysroot_amd64
- matrix:
arch: aarch64
packages:
- *gcc_aarch64
- *sysroot_aarch64
- output_types: conda
matrices:
- matrix:
arch: x86_64
cuda: "11.8"
packages:
- nvcc_linux-64=11.8
- matrix:
arch: aarch64
cuda: "11.8"
packages:
- nvcc_linux-aarch64=11.8
- matrix:
cuda: "12.0"
packages:
- cuda-version=12.0
- cuda-nvcc
build_python:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
Loading