From 64d43ea075ddc4a4d5959f73c6b61afc10e8b84c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 4 Dec 2024 21:03:55 -0600 Subject: [PATCH 1/2] Upgrade nvcomp to 4.1.1.1 --- 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 2de4597657..2bb0d65be4 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.1.0.6 +- nvcomp==4.1.1.1 - 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 8b63a6726b..5862062b35 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.1.0.6 +- nvcomp==4.1.1.1 - 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 87759faf53..69cd3ef1fa 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.1.0.6 +- nvcomp==4.1.1.1 - 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 e0a10af655..00e6557212 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.1.0.6 +- nvcomp==4.1.1.1 - packaging - pre-commit - pytest diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 8af5f6f9c2..d74695a283 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.1.0.6" + - "=4.1.1.1" diff --git a/dependencies.yaml b/dependencies.yaml index fe85506ce5..48c74d3810 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -268,21 +268,21 @@ dependencies: common: - output_types: conda packages: - - nvcomp==4.1.0.6 + - nvcomp==4.1.1.1 specific: - output_types: [requirements, pyproject] matrices: - matrix: cuda: "12.*" packages: - - nvidia-nvcomp-cu12==4.1.0.6 + - nvidia-nvcomp-cu12==4.1.1.1 - matrix: cuda: "11.*" packages: - - nvidia-nvcomp-cu11==4.1.0.6 + - nvidia-nvcomp-cu11==4.1.1.1 - matrix: packages: - - nvidia-nvcomp==4.1.0.6 + - nvidia-nvcomp==4.1.1.1 depends_on_libkvikio: common: - output_types: conda diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index cafde598bd..e667d9d59c 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -23,7 +23,7 @@ dependencies = [ "libkvikio==24.12.*,>=0.0.0a0", "numcodecs !=0.12.0", "numpy>=1.23,<3.0a0", - "nvidia-nvcomp==4.1.0.6", + "nvidia-nvcomp==4.1.1.1", "packaging", "zarr", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. From ae30f8a707642c8a914d9fc602eecef0c5f45aaa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 4 Dec 2024 21:05:59 -0600 Subject: [PATCH 2/2] Test with rapids-cmake upstream branch. --- 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..3e04c6c4e7 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.1.1) + 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}")