From a72a105ffe0b054aa0bcc438b3728dfc4463814e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 26 Feb 2024 09:30:33 -0600 Subject: [PATCH] Bump to nvcomp 3.0.6. (#346) This PR bumps nvcomp to 3.0.6. This is needed as a hotfix for https://github.com/rapidsai/cudf/issues/15096. Depends on: - https://github.com/conda-forge/nvcomp-feedstock/pull/14 - https://github.com/rapidsai/rapids-cmake/pull/542 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) --- ci/release/update-version.sh | 11 +---------- conda/environments/all_cuda-118_arch-x86_64.yaml | 3 +-- conda/environments/all_cuda-120_arch-x86_64.yaml | 3 +-- conda/recipes/kvikio/conda_build_config.yaml | 2 +- dependencies.yaml | 8 +------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 3cf72b0d7b..0e8a476590 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. ########################## # KvikIO Version Updater # ########################## @@ -60,15 +60,6 @@ sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '${NEXT_FULL_ sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py -DEPENDENCIES=( - cudf -) -for DEP in "${DEPENDENCIES[@]}"; do - for FILE in dependencies.yaml conda/environments/*.yaml; do - sed_runner "/-.* ${DEP}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" ${FILE} - done -done - # CI files for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c31b7d44f3..fd500cc5be 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -11,7 +11,6 @@ dependencies: - cuda-python>=11.7.1,<12.0a0 - cuda-version=11.8 - cudatoolkit -- cudf==24.2.* - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 @@ -26,7 +25,7 @@ dependencies: - numpy>=1.21 - numpydoc - nvcc_linux-64=11.8 -- nvcomp==3.0.5 +- nvcomp==3.0.6 - packaging - pre-commit - pytest diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index e0cfd064b4..48337c2141 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -11,7 +11,6 @@ dependencies: - cuda-nvcc - cuda-python>=12.0,<13.0a0 - cuda-version=12.0 -- cudf==24.2.* - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 @@ -25,7 +24,7 @@ dependencies: - numcodecs <0.12.0 - numpy>=1.21 - numpydoc -- nvcomp==3.0.5 +- nvcomp==3.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 9015a36d29..d7ca022e19 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -17,4 +17,4 @@ cmake_version: - ">=3.26.4" nvcomp_version: - - "=3.0.5" + - "=3.0.6" diff --git a/dependencies.yaml b/dependencies.yaml index 8f669fb89a..4817f85314 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -12,7 +12,6 @@ files: - cuda - cuda_version - docs - - notebooks - py_version - run - test_python @@ -173,7 +172,7 @@ dependencies: common: - output_types: conda packages: - - nvcomp==3.0.5 + - nvcomp==3.0.6 specific: - output_types: conda matrices: @@ -283,8 +282,3 @@ dependencies: packages: - *dask - distributed>=2022.05.2 - notebooks: - common: - - output_types: conda - packages: - - cudf==24.2.*