Skip to content

Commit

Permalink
Merge pull request #302 from rapidsai/branch-23.10
Browse files Browse the repository at this point in the history
Forward-merge branch-23.10 to branch-23.12
  • Loading branch information
GPUtester authored Oct 10, 2023
2 parents 7703b40 + 5ef30fb commit dfa2d31
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- libcufile-dev=1.4.0.31
- libcufile=1.4.0.31
- ninja
- numcodecs <0.12.0
- numpy>=1.21
- numpydoc
- nvcc_linux-64=11.8
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- libcufile
- libcufile-dev
- ninja
- numcodecs <0.12.0
- numpy>=1.21
- numpydoc
- nvcomp==2.6.1
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/kvikio/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ requirements:
- numpy >=1.20
- cupy >=12.0.0
- zarr
# See https://github.com/zarr-developers/numcodecs/pull/475
- numcodecs <0.12.0
- packaging
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
Expand Down
2 changes: 2 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ dependencies:
packages:
- numpy>=1.21
- zarr
# See https://github.com/zarr-developers/numcodecs/pull/475
- numcodecs <0.12.0
- packaging
- output_types: conda
packages:
Expand Down
1 change: 1 addition & 0 deletions legate/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"cupy-cuda11x>=12.0.0",
"numcodecs <0.12.0",
"numpy>=1.21",
"packaging",
"zarr",
Expand Down
1 change: 1 addition & 0 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"cupy-cuda11x>=12.0.0",
"numcodecs <0.12.0",
"numpy>=1.21",
"packaging",
"zarr",
Expand Down

0 comments on commit dfa2d31

Please sign in to comment.