fix python paths for cuml nesting

rapidsai · Jun 25, 2024 · ae1f540 · ae1f540
1 parent af89fdc
commit ae1f540
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/build.sh b/build.sh
@@ -61,7 +61,7 @@ HELP="$0 [<target> ...] [<flag> ...]
    CUML_EXTRA_PYTHON_ARGS - Extra arguments to pass directly to pip install
 "
 LIBCUML_BUILD_DIR=${LIBCUML_BUILD_DIR:=${REPODIR}/cpp/build}
-CUML_BUILD_DIR=${REPODIR}/python/build
+CUML_BUILD_DIR=${REPODIR}/python/cuml/build
 PYTHON_DEPS_CLONE=${REPODIR}/python/external_repositories
 BUILD_DIRS="${LIBCUML_BUILD_DIR} ${CUML_BUILD_DIR} ${PYTHON_DEPS_CLONE}"
 
@@ -294,7 +294,7 @@ if (! hasArg --configure-only) && (completeBuild || hasArg cuml || hasArg pydocs
     fi
 
     SKBUILD_CMAKE_ARGS="-DCMAKE_MESSAGE_LOG_LEVEL=${CMAKE_LOG_LEVEL};${SKBUILD_EXTRA_CMAKE_ARGS}" \
-        python -m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true ${REPODIR}/python
+        python -m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cuml
 
     if hasArg pydocs; then
         cd ${REPODIR}/docs
@@ -304,5 +304,5 @@ fi
 
 if hasArg cuml-cpu; then
     SKBUILD_CMAKE_ARGS="-DCUML_CPU=ON;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE" \
-        python -m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true ${REPODIR}/python
+        python -m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cuml
 fi
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-package_dir="python"
+package_dir="python/cuml"
 
 source rapids-configure-sccache
 source rapids-date-string

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -68,12 +68,14 @@ files:
       - test_notebooks
   py_build:
     output: pyproject
+    pyproject_dir: python/cuml
     extras:
       table: build-system
     includes:
       - rapids_build_backend
   py_rapids_build:
     output: pyproject
+    pyproject_dir: python/cuml
     extras:
       table: tool.rapids-build-backend
       key: requires
@@ -82,12 +84,14 @@ files:
       - py_build
   py_run:
     output: pyproject
+    pyproject_dir: python/cuml
     extras:
       table: project
     includes:
       - py_run
   py_test:
     output: pyproject
+    pyproject_dir: python/cuml
     extras:
       table: project.optional-dependencies
       key: test

diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml
@@ -16,7 +16,7 @@
 requires = [
     "rapids-build-backend>=0.3.0,<0.4.0.dev0",
     "scikit-build-core[pyproject]>=0.7.0",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 build-backend = "rapids_build_backend.build"
 
 [tool.pytest.ini_options]
@@ -93,7 +93,7 @@ dependencies = [
     "rmm==24.8.*,>=0.0.0a0",
     "scipy>=1.8.0",
     "treelite==4.2.1",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python",
@@ -120,7 +120,7 @@ test = [
     "seaborn",
     "statsmodels",
     "umap-learn==0.5.3",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project.urls]
 Homepage = "https://github.com/rapidsai/cuml"
@@ -160,7 +160,7 @@ requires = [
     "pylibraft==24.8.*,>=0.0.0a0",
     "rmm==24.8.*,>=0.0.0a0",
     "treelite==4.2.1",
-] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
+] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 dependencies-file = "../dependencies.yaml"
 
 [tool.scikit-build]