From 1707ee59cc1b03343c7166ee76d9389e47e62b90 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 29 Oct 2024 12:40:49 -0500 Subject: [PATCH 1/3] Test nvcomp 4.1.0.6 --- rapids_config.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rapids_config.cmake b/rapids_config.cmake index 3a88769f6e7..43b6fe39fe2 100644 --- a/rapids_config.cmake +++ b/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 991e05f12bb7d9120963199c72d6b07beaa68b81 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 29 Oct 2024 13:47:09 -0500 Subject: [PATCH 2/3] Use nvcomp 4.1.0.6 in dependencies.yaml and conda recipe. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/libcudf/conda_build_config.yaml | 2 +- dependencies.yaml | 8 ++++---- python/libcudf/pyproject.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c3716c4759a..f3bbaaa8779 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,7 @@ dependencies: - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 -- nvcomp==4.0.1 +- nvcomp==4.1.0.6 - nvtx>=0.2.1 - openpyxl - packaging diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 38e131e79cb..38c5b361f70 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -56,7 +56,7 @@ dependencies: - numba-cuda>=0.0.13 - numpy>=1.23,<3.0a0 - numpydoc -- nvcomp==4.0.1 +- nvcomp==4.1.0.6 - nvtx>=0.2.1 - openpyxl - packaging diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index dc75eb4b252..c78ca326005 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -35,7 +35,7 @@ spdlog_version: - ">=1.14.1,<1.15" nvcomp_version: - - "=4.0.1" + - "=4.1.0.6" zlib_version: - ">=1.2.13" diff --git a/dependencies.yaml b/dependencies.yaml index 7c7aa43fa41..bd1a5deb878 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -399,21 +399,21 @@ dependencies: - output_types: conda packages: # Align nvcomp version with rapids-cmake - - 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 rapids_build_skbuild: common: - output_types: [conda, requirements, pyproject] diff --git a/python/libcudf/pyproject.toml b/python/libcudf/pyproject.toml index 84660cbc276..c6d9ae56467 100644 --- a/python/libcudf/pyproject.toml +++ b/python/libcudf/pyproject.toml @@ -38,7 +38,7 @@ classifiers = [ "Environment :: GPU :: NVIDIA CUDA", ] dependencies = [ - "nvidia-nvcomp==4.0.1", + "nvidia-nvcomp==4.1.0.6", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] From 231dc5492441f73c2eef95aa574ed4eab78fb323 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 30 Oct 2024 08:39:07 -0500 Subject: [PATCH 3/3] Remove testing changes. --- rapids_config.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index 43b6fe39fe2..3a88769f6e7 100644 --- a/rapids_config.cmake +++ b/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}")