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

Don't use CMake 3.25.0 as it has a FindCUDAToolkit show stopping bug #805

Merged
Merged
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/cuspatial_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- cudatoolkit=11.5
- gdal>=3.0.2
- geopandas>=0.11.0
- cmake>=3.23.1
- cmake>=3.23.1,!=3.25.0
- cython>=0.29,<0.30
- scikit-build>=0.13.1
- gtest=1.10.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements:
host:
- python
- cython >=0.29,<0.30
- cmake>=3.23.1
- cmake>=3.23.1,!=3.25.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of scope to fix in this PR, but the cuspatial and libcuspatial libraries should be aligned in terms of where they specify their required versions (conda_build_config.yaml vs meta.yaml) @thomcom @isVoid

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the reminder, do you mind filing an issue?

- scikit-build>=0.13.1
- setuptools
- cudf {{ minor_version }}.*
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcuspatial/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cuda_compiler:
- nvcc

cmake_version:
- ">=3.23.1"
- ">=3.23.1,!=3.25.0"

gdal_version:
- ">3.5.0"
Expand Down
2 changes: 1 addition & 1 deletion python/cuspatial/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ requires = [
"setuptools",
"cython>=0.29,<0.30",
"scikit-build>=0.13.1",
"cmake>=3.23.1",
"cmake>=3.23.1,!=3.25.0",
"ninja",
]