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.

Sign up for GitHub

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

Forward-merge branch-25.02 into branch-25.04 #640

Merged
merged 1 commit into from
Feb 20, 2025
Merged

Forward-merge branch-25.02 into branch-25.04 #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-aarch64=11.8
- nvcomp==4.1.0.6
- nvcomp==4.2.0.11
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies:
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
- nvcomp==4.1.0.6
- nvcomp==4.2.0.11
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-128_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- numcodecs !=0.12.0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.1.0.6
- nvcomp==4.2.0.11
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-128_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- numcodecs !=0.12.0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.1.0.6
- nvcomp==4.2.0.11
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/kvikio/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ libcurl_version:
- "==8.5.0"

nvcomp_version:
- "=4.1.0.6"
- "=4.2.0.11"
8 changes: 4 additions & 4 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,20 +297,20 @@ dependencies:
common:
- output_types: conda
packages:
- nvcomp==4.1.0.6
- nvcomp==4.2.0.11
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
use_cuda_wheels: "true"
packages:
- nvidia-nvcomp-cu12==4.1.0.6
- nvidia-nvcomp-cu12==4.2.0.11
- matrix:
cuda: "11.*"
use_cuda_wheels: "true"
packages:
- nvidia-nvcomp-cu11==4.1.0.6
- nvidia-nvcomp-cu11==4.2.0.11
# if use_cuda_wheels=false is provided, do not add dependencies on any CUDA wheels
# (e.g. for DLFW and pip devcontainers)
- matrix:
Expand All @@ -320,7 +320,7 @@ dependencies:
# (just as a source of documentation, as this populates pyproject.toml in source control)
- matrix:
packages:
- nvidia-nvcomp==4.1.0.6
- nvidia-nvcomp==4.2.0.11
depends_on_libkvikio:
common:
- output_types: conda
Expand Down
2 changes: 1 addition & 1 deletion python/kvikio/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies = [
"libkvikio==25.2.*,>=0.0.0a0",
"numcodecs !=0.12.0",
"numpy>=1.23,<3.0a0",
"nvidia-nvcomp==4.1.0.6",
"nvidia-nvcomp==4.2.0.11",
"packaging",
"zarr>=2.0.0,<3.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
Loading