Skip to content

Commit

Permalink
Merge branch 'branch-24.12' into cufile_driver
Browse files Browse the repository at this point in the history
  • Loading branch information
madsbk authored Oct 30, 2024
2 parents c55c5af + 607c6a5 commit 635ae32
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-aarch64=11.8
- nvcomp==4.0.1
- nvcomp==4.1.0.6
- packaging
- pre-commit
- pytest
Expand Down
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 @@ -27,7 +27,7 @@ dependencies:
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
- nvcomp==4.0.1
- nvcomp==4.1.0.6
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- numcodecs !=0.12.0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.0.1
- nvcomp==4.1.0.6
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- numcodecs !=0.12.0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.0.1
- nvcomp==4.1.0.6
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/kvikio/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ cmake_version:
- ">=3.26.4,!=3.30.0"

nvcomp_version:
- "=4.0.1"
- "=4.1.0.6"
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -267,21 +267,21 @@ dependencies:
common:
- output_types: conda
packages:
- nvcomp==4.0.1
- nvcomp==4.1.0.6
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
packages:
- nvidia-nvcomp-cu12==4.0.1
- nvidia-nvcomp-cu12==4.1.0.6
- matrix:
cuda: "11.*"
packages:
- nvidia-nvcomp-cu11==4.0.1
- nvidia-nvcomp-cu11==4.1.0.6
- matrix:
packages:
- nvidia-nvcomp==4.0.1
- nvidia-nvcomp==4.1.0.6
docs:
common:
- output_types: [conda, requirements]
Expand Down
2 changes: 1 addition & 1 deletion python/kvikio/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"cupy-cuda11x>=12.0.0",
"numcodecs !=0.12.0",
"numpy>=1.23,<3.0a0",
"nvidia-nvcomp==4.0.1",
"nvidia-nvcomp==4.1.0.6",
"packaging",
"zarr",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down

0 comments on commit 635ae32

Please sign in to comment.