Skip to content

Commit

Permalink
Merge pull request NVIDIA#11414 from rapidsai/branch-22.08
Browse files Browse the repository at this point in the history
[gpuCI] Forward-merge branch-22.08 to branch-22.10 [skip gpuci]
  • Loading branch information
GPUtester authored Aug 1, 2022
2 parents b68ecd1 + 736531b commit a36c363
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requirements:
- python
- typing_extensions
- pandas >=1.0,<1.5.0dev0
- cupy >=9.5.0,<12.0.0a0
- cupy >=9.5.0,<11.0.0a0
- numba >=0.54
- numpy
- {{ pin_compatible('pyarrow', max_pin='x.x.x') }} *cuda
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def get_cuda_version_from_header(cuda_include_dir, delimeter=""):
install_requires.append(
"cupy-cuda"
+ get_cuda_version_from_header(cuda_include_dir)
+ ">=9.5.0,<12.0.0a0"
+ ">=9.5.0,<11.0.0a0"
)


Expand Down
2 changes: 1 addition & 1 deletion python/dask_cudf/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_cuda_version_from_header(cuda_include_dir, delimeter=""):
install_requires.append(
"cupy-cuda"
+ get_cuda_version_from_header(cuda_include_dir)
+ ">=9.5.0,<12.0.0a0"
+ ">=9.5.0,<11.0.0a0"
)


Expand Down

0 comments on commit a36c363

Please sign in to comment.