From b45c6a8a110dbf410d5b5fd792abde9bc577417c Mon Sep 17 00:00:00 2001 From: Vukasin Milovanovic Date: Mon, 18 Aug 2025 11:51:28 -0700 Subject: [PATCH 1/4] switch to nvcomp 5 --- ci/build_wheel_python.sh | 2 +- conda/environments/all_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-129_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/conda_build_config.yaml | 2 +- dependencies.yaml | 2 +- python/libkvikio/cmake/thirdparty/get_nvcomp.cmake | 2 +- python/libkvikio/libkvikio/load.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/build_wheel_python.sh b/ci/build_wheel_python.sh index 55ee0c05a0..ed2df80542 100755 --- a/ci/build_wheel_python.sh +++ b/ci/build_wheel_python.sh @@ -22,7 +22,7 @@ export SKBUILD_CMAKE_ARGS="-DUSE_NVCOMP_RUNTIME_WHEEL=ON" python -m auditwheel repair \ --exclude libkvikio.so \ - --exclude libnvcomp.so.4 \ + --exclude libnvcomp.so.5 \ -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" \ ${package_dir}/dist/* diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index f72a97faf3..252394adbc 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -19,7 +19,7 @@ dependencies: - libcufile-dev - libcurl>=8.5.0,<9.0a0 - libnuma -- libnvcomp-dev==4.2.0.11 +- libnvcomp-dev==5.0.0.6 - moto>=4.0.8 - ninja - numcodecs !=0.12.0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 890bfc29d7..f3208c58a8 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -19,7 +19,7 @@ dependencies: - libcufile-dev - libcurl>=8.5.0,<9.0a0 - libnuma -- libnvcomp-dev==4.2.0.11 +- libnvcomp-dev==5.0.0.6 - moto>=4.0.8 - ninja - numcodecs !=0.12.0 diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 2694d62eac..80ccdb42e0 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -20,4 +20,4 @@ libcurl_version: - "==8.5.0" nvcomp_version: - - "=4.2.0.11" + - "=5.0.0.6" diff --git a/dependencies.yaml b/dependencies.yaml index 92fdec6bd5..b33bb7d439 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -224,7 +224,7 @@ dependencies: common: - output_types: conda packages: - - libnvcomp-dev==4.2.0.11 + - libnvcomp-dev==5.0.0.6 depends_on_libkvikio: common: - output_types: conda diff --git a/python/libkvikio/cmake/thirdparty/get_nvcomp.cmake b/python/libkvikio/cmake/thirdparty/get_nvcomp.cmake index 0901c1e349..a2e85c88eb 100644 --- a/python/libkvikio/cmake/thirdparty/get_nvcomp.cmake +++ b/python/libkvikio/cmake/thirdparty/get_nvcomp.cmake @@ -20,7 +20,7 @@ function(find_and_configure_nvcomp) include(${rapids-cmake-dir}/cpm/nvcomp.cmake) set(export_args) if(KvikIO_EXPORT_NVCOMP) - # We're vendoring nvcomp and we only want `libnvcomp.so.4` + # We're vendoring nvcomp and we only want `libnvcomp.so.5` set(export_args BUILD_EXPORT_SET nvcomp) endif() diff --git a/python/libkvikio/libkvikio/load.py b/python/libkvikio/libkvikio/load.py index c790d2dd00..0a62171df1 100644 --- a/python/libkvikio/libkvikio/load.py +++ b/python/libkvikio/libkvikio/load.py @@ -46,7 +46,7 @@ def _load_wheel_installation(soname: str): def load_library(): # TODO: remove this nvcomp load when `nvcomp` is re-de-vendored # https://github.com/rapidsai/build-planning/issues/171 - _load_library("libnvcomp.so.4") + _load_library("libnvcomp.so.5") return _load_library("libkvikio.so") From 1254869adb851607eedd13eca4976170cb28db1c Mon Sep 17 00:00:00 2001 From: Vukasin Milovanovic Date: Mon, 18 Aug 2025 11:51:40 -0700 Subject: [PATCH 2/4] REVERT ME --- cmake/rapids_config.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/rapids_config.cmake b/cmake/rapids_config.cmake index b2c54a3f27..9e27995c8e 100644 --- a/cmake/rapids_config.cmake +++ b/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 vuule/rapids-cmake) +set(rapids-cmake-branch fea-nvcomp-5) + 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 80d92dce2799dfb9399c363c53ed2952d037df13 Mon Sep 17 00:00:00 2001 From: Vukasin Milovanovic Date: Tue, 19 Aug 2025 16:48:02 -0700 Subject: [PATCH 3/4] remove cmake hack --- cmake/rapids_config.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake/rapids_config.cmake b/cmake/rapids_config.cmake index 9e27995c8e..daa55a7fa5 100644 --- a/cmake/rapids_config.cmake +++ b/cmake/rapids_config.cmake @@ -12,9 +12,6 @@ # the License. # ============================================================================= -set(rapids-cmake-repo vuule/rapids-cmake) -set(rapids-cmake-branch fea-nvcomp-5) - 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 8220bae07754cd11f558ac227b139c090a419b04 Mon Sep 17 00:00:00 2001 From: Vukasin Milovanovic Date: Tue, 19 Aug 2025 16:48:30 -0700 Subject: [PATCH 4/4] remove extra line --- cmake/rapids_config.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/rapids_config.cmake b/cmake/rapids_config.cmake index daa55a7fa5..b2c54a3f27 100644 --- a/cmake/rapids_config.cmake +++ b/cmake/rapids_config.cmake @@ -11,7 +11,6 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= - 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}")