clean up dependencies

rapidsai · Jan 10, 2025 · 76d788b · 76d788b
1 parent c224e27
commit 76d788b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -87,6 +87,7 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       package-name: libraft
+      package-type: cpp
   wheel-build-pylibraft:
     needs: wheel-publish-libraft
     secrets: inherit
@@ -107,6 +108,7 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       package-name: pylibraft
+      package-type: python
   wheel-build-raft-dask:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
@@ -126,3 +128,4 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       package-name: raft_dask
+      package-type: python
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -6,6 +6,8 @@ files:
       cuda: ["11.8", "12.5"]
       arch: [x86_64, aarch64]
     includes:
+      - build_common
+      - build_cython
       - checks
       - cuda
       - cuda_version
@@ -15,7 +17,6 @@ files:
       - depends_on_rmm
       - develop
       - docs
-      - rapids_build
       - rapids_build_skbuild
       - run_pylibraft
       - run_raft_dask
@@ -62,9 +63,8 @@ files:
       table: tool.rapids-build-backend
       key: requires
     includes:
-      - depends_on_cuda_python
+      - build_common
       - depends_on_librmm
-      - rapids_build
   py_run_libraft:
     output: pyproject
     pyproject_dir: python/libraft
@@ -86,11 +86,12 @@ files:
       table: tool.rapids-build-backend
       key: requires
     includes:
+      - build_common
+      - build_cython
       - depends_on_libraft
       - depends_on_librmm
       - depends_on_cuda_python
       - depends_on_rmm
-      - rapids_build
   py_run_pylibraft:
     output: pyproject
     pyproject_dir: python/pylibraft
@@ -125,10 +126,11 @@ files:
       table: tool.rapids-build-backend
       key: requires
     includes:
+      - build_common
+      - build_cython
       - depends_on_libraft
       - depends_on_librmm
       - depends_on_ucx_build
-      - rapids_build
   py_run_raft_dask:
     output: pyproject
     pyproject_dir: python/raft-dask
@@ -164,12 +166,11 @@ dependencies:
       - output_types: [requirements, pyproject]
         packages:
           - scikit-build-core[pyproject]>=0.10.0
-  rapids_build:
+  build_common:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
           - &cmake_ver cmake>=3.26.4,!=3.30.0
-          - cython>=3.0.0,<3.1.0a0
           - ninja
       - output_types: [conda]
         packages:
@@ -211,7 +212,11 @@ dependencies:
             packages: [nvcc_linux-64=11.2]
           - matrix: {cuda: "11.2", arch: aarch64}
             packages: [nvcc_linux-aarch64=11.2]
-
+  build_cython:
+    common:
+      - output_types: [conda, requirements, pyproject]
+        packages:
+          - cython>=3.0.0,<3.1.0a0
   checks:
     common:
       - output_types: [conda, requirements]

diff --git a/python/libraft/CMakeLists.txt b/python/libraft/CMakeLists.txt
@@ -16,13 +16,10 @@ cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
 
 include(../../rapids_config.cmake)
 
-# include(rapids-cuda)
-# rapids_cuda_init_architectures(libraft-python)
-
 project(
   libraft-python
   VERSION "${RAPIDS_VERSION}"
-  LANGUAGES CXX CUDA
+  LANGUAGES CXX
 )
 
 option(USE_CUDA_MATH_WHEELS "Use the CUDA math wheels instead of the system libraries" OFF)
@@ -54,9 +51,6 @@ elseif(USE_CUDA_MATH_WHEELS)
   message(FATAL_ERROR "Cannot use CUDA math wheels with CUDA < 12.0")
 endif()
 
-# ensure installs are inside the libraft/ folder in site-packages/
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-
 add_subdirectory(../../cpp raft-cpp)
 
 if(NOT CUDA_STATIC_MATH_LIBRARIES AND USE_CUDA_MATH_WHEELS)

diff --git a/python/libraft/pyproject.toml b/python/libraft/pyproject.toml
@@ -102,8 +102,6 @@ regex = "(?P<value>.*)"
 build-backend = "scikit_build_core.build"
 requires = [
     "cmake>=3.26.4,!=3.30.0",
-    "cuda-python",
-    "cython>=3.0.0,<3.1.0a0",
     "librmm==25.2.*,>=0.0.0a0",
     "ninja",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.