diff --git a/ci/build_wheel_python.sh b/ci/build_wheel_python.sh index a75ef5b08b..4f50a1e376 100755 --- a/ci/build_wheel_python.sh +++ b/ci/build_wheel_python.sh @@ -24,6 +24,7 @@ cd "${package_dir}" echo "libkvikio-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${CPP_WHEELHOUSE}/libkvikio_*.whl)" > ./constraints.txt PIP_CONSTRAINT="${PWD}/constraints.txt" \ +SKBUILD_CMAKE_ARGS="-DFIND_KVIKIO_CPP=ON" \ python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check mkdir -p final_dist diff --git a/python/kvikio/CMakeLists.txt b/python/kvikio/CMakeLists.txt index 9217645637..2121da90f2 100644 --- a/python/kvikio/CMakeLists.txt +++ b/python/kvikio/CMakeLists.txt @@ -34,7 +34,7 @@ option(FIND_KVIKIO_CPP include(../../cpp/cmake/Modules/FindcuFile.cmake) if(FIND_KVIKIO_CPP) - find_package(KvikIO "${RAPIDS_VERSION}") + find_package(KvikIO REQUIRED "${RAPIDS_VERSION}") else() set(KvikIO_FOUND OFF) endif() diff --git a/python/kvikio/cmake/thirdparty/get_nvcomp.cmake b/python/kvikio/cmake/thirdparty/get_nvcomp.cmake index ff39366bff..9361624c07 100644 --- a/python/kvikio/cmake/thirdparty/get_nvcomp.cmake +++ b/python/kvikio/cmake/thirdparty/get_nvcomp.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -18,11 +18,7 @@ set(KVIKIO_USE_PROPRIETARY_BINARY ON) function(find_and_configure_nvcomp) include(${rapids-cmake-dir}/cpm/nvcomp.cmake) - rapids_cpm_nvcomp( - BUILD_EXPORT_SET kvikio-exports - INSTALL_EXPORT_SET kvikio-exports - USE_PROPRIETARY_BINARY ${KVIKIO_USE_PROPRIETARY_BINARY} - ) + rapids_cpm_nvcomp(USE_PROPRIETARY_BINARY ${KVIKIO_USE_PROPRIETARY_BINARY}) # Per-thread default stream if(TARGET nvcomp AND PER_THREAD_DEFAULT_STREAM) diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index 3f68177280..1485ebd87c 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -127,6 +127,7 @@ ninja.make-fallback = true sdist.exclude = ["*tests*"] sdist.reproducible = true wheel.packages = ["kvikio"] +wheel.exclude = ["*.pyx", "CMakeLists.txt"] [tool.scikit-build.metadata.version] provider = "scikit_build_core.metadata.regex" diff --git a/python/libkvikio/pyproject.toml b/python/libkvikio/pyproject.toml index 51306fcf94..80b5baaeb3 100644 --- a/python/libkvikio/pyproject.toml +++ b/python/libkvikio/pyproject.toml @@ -41,6 +41,7 @@ sdist.exclude = ["*tests*"] sdist.reproducible = true wheel.packages = ["libkvikio"] wheel.py-api = "py3" +wheel.install-dir = "libkvikio" [tool.scikit-build.metadata.version] provider = "scikit_build_core.metadata.regex" @@ -55,3 +56,6 @@ requires = [ "cmake>=3.26.4,!=3.30.0", "ninja", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. + +[project.entry-points."cmake.prefix"] +libkvikio = "libkvikio"