Merge branch 'branch-23.10' into fea-nvcomp-roundtrip

rapidsai · Jul 31, 2023 · ade06c4 · ade06c4
2 parents 694a63f + 8789aba
commit ade06c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 71 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -16,10 +16,9 @@ cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
 
 set(kvikio_version 23.10.00)
 
-set(CYTHON_FLAGS
-    "--directive binding=True,embedsignature=True,always_allow_keywords=True"
-    CACHE STRING "The directives for Cython compilation."
-)
+include(../cpp/cmake/fetch_rapids.cmake)
+include(rapids-cuda)
+rapids_cuda_init_architectures(kvikio-python)
 
 project(
   kvikio-python
@@ -35,15 +34,9 @@ option(FIND_KVIKIO_CPP
        "Search for existing KVIKIO C++ installations before defaulting to local files" OFF
 )
 
-find_package(PythonExtensions REQUIRED)
-find_package(Cython REQUIRED)
-
 # TODO: Should we symlink FindcuFile.cmake into python/cmake? find cuFile
 include(../cpp/cmake/Modules/FindcuFile.cmake)
 
-# Ignore unused variable warning.
-set(ignored_variable "${SKBUILD}")
-
 if(FIND_KVIKIO_CPP)
   find_package(KvikIO ${kvikio_version})
 else()
@@ -54,7 +47,12 @@ find_package(CUDAToolkit REQUIRED)
 
 if(NOT KVIKIO_FOUND)
   add_subdirectory(../cpp kvikio-cpp)
+  set(cython_lib_dir kvikio)
+  install(TARGETS kvikio DESTINATION ${cython_lib_dir})
 endif()
 
+include(rapids-cython)
+rapids_cython_init()
+
 add_subdirectory(cmake)
 add_subdirectory(kvikio/_lib)
diff --git a/python/cmake/CMakeLists.txt b/python/cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2022, NVIDIA CORPORATION.
+# Copyright (c) 2022-2023, 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
@@ -13,4 +13,3 @@
 # =============================================================================
 
 include(thirdparty/get_nvcomp.cmake)
-include(kvikio_python_helpers.cmake)
diff --git a/python/cmake/kvikio_python_helpers.cmake b/python/cmake/kvikio_python_helpers.cmake
diff --git a/python/kvikio/_lib/CMakeLists.txt b/python/kvikio/_lib/CMakeLists.txt
@@ -13,10 +13,10 @@
 # =============================================================================
 
 # Set the list of Cython files to build
-set(cython_modules arr libnvcomp libnvcomp_ll libkvikio)
+set(cython_modules arr.pyx libnvcomp.pyx libnvcomp_ll.pyx libkvikio.pyx)
 
-# Build all of the Cython targets
-add_cython_modules("${cython_modules}")
-
-target_link_libraries(libnvcomp nvcomp::nvcomp)
-target_link_libraries(libnvcomp_ll nvcomp::nvcomp)
+rapids_cython_create_modules(
+  CXX
+  SOURCE_FILES "${cython_modules}"
+  LINKED_LIBRARIES nvcomp::nvcomp
+)