From 687f7573006b76cae909a753025c5baceb99b5ed Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 29 Oct 2024 12:42:57 -0500 Subject: [PATCH 1/3] Test nvcomp 4.1.0.6 --- cpp/cmake/rapids_config.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpp/cmake/rapids_config.cmake b/cpp/cmake/rapids_config.cmake index c3a6a0ef13..6a661bd0df 100644 --- a/cpp/cmake/rapids_config.cmake +++ b/cpp/cmake/rapids_config.cmake @@ -11,6 +11,10 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= + +set(rapids-cmake-repo bdice/rapids-cmake) +set(rapids-cmake-branch nvcomp-4.1.0.6) + file(READ "${CMAKE_CURRENT_LIST_DIR}/../../VERSION" _rapids_version) if(_rapids_version MATCHES [[^([0-9][0-9])\.([0-9][0-9])\.([0-9][0-9])]]) set(RAPIDS_VERSION_MAJOR "${CMAKE_MATCH_1}") From 45e7389f99148e7e25b7cdd29235f1ebd7b84da5 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 29 Oct 2024 13:47:56 -0500 Subject: [PATCH 2/3] Use nvcomp 4.1.0.6 in dependencies.yaml and conda recipe. --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/conda_build_config.yaml | 2 +- dependencies.yaml | 8 ++++---- python/kvikio/pyproject.toml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index ef1215d51b..54cbb12072 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 842b984cc6..ff3da55951 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index 9a4b3e94bd..41f6e6b3a3 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 2b926acf29..cab86c6fdc 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -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 diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 35cb51e2f9..8af5f6f9c2 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -20,4 +20,4 @@ cmake_version: - ">=3.26.4,!=3.30.0" nvcomp_version: - - "=4.0.1" + - "=4.1.0.6" diff --git a/dependencies.yaml b/dependencies.yaml index 85bf871150..ae99fb5d83 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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] diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index 25a961a858..b30437cec0 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -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`. From 62265bbbeb02e33aee332d6a191bfa4ca62fff1a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 30 Oct 2024 08:39:04 -0500 Subject: [PATCH 3/3] Remove testing changes. --- cpp/cmake/rapids_config.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cpp/cmake/rapids_config.cmake b/cpp/cmake/rapids_config.cmake index 6a661bd0df..c3a6a0ef13 100644 --- a/cpp/cmake/rapids_config.cmake +++ b/cpp/cmake/rapids_config.cmake @@ -11,10 +11,6 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= - -set(rapids-cmake-repo bdice/rapids-cmake) -set(rapids-cmake-branch nvcomp-4.1.0.6) - file(READ "${CMAKE_CURRENT_LIST_DIR}/../../VERSION" _rapids_version) if(_rapids_version MATCHES [[^([0-9][0-9])\.([0-9][0-9])\.([0-9][0-9])]]) set(RAPIDS_VERSION_MAJOR "${CMAKE_MATCH_1}")