Skip to content
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
8e62fb1
Add nvforest as dependency
chyunsu3 May 4, 2026
f826bc2
Remove FIL; add nvForest to CMake
chyunsu3 May 4, 2026
4142a2c
Link nvforest if LINK_NVFOREST=1
chyunsu3 May 5, 2026
8cd428f
Remove cuml/forest headers
chyunsu3 May 5, 2026
8d5c2b9
Remove cuml.fil from Python
chyunsu3 May 5, 2026
bc7212f
Add compatibility layer for cuml.fil
chyunsu3 May 5, 2026
dbc47b2
Use nvForest in cuML RF
chyunsu3 May 5, 2026
2b64436
Update pytests; remove FIL from benchmark
chyunsu3 May 6, 2026
c11194d
Update test_fil.py
chyunsu3 May 6, 2026
8b188b6
Update pytests
chyunsu3 May 6, 2026
35107c2
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 6, 2026
f17cd37
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 6, 2026
1a8ada3
Add libnvforest as dep for gtest
chyunsu3 May 6, 2026
080e9bd
Add nvforest to Conda recipe
chyunsu3 May 6, 2026
fee06a1
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 9, 2026
605847e
Address review comments by coderabbitai
chyunsu3 May 9, 2026
310c27e
Revert changes to test_random_forest.py
chyunsu3 May 9, 2026
4a9499e
Revert changes to test_random_forest.py
chyunsu3 May 9, 2026
72acfac
Fix test_random_forest.py
chyunsu3 May 9, 2026
c883107
Use convert_dtype arg
chyunsu3 May 9, 2026
4cfdc08
Revert changes to test_fil.py
chyunsu3 May 9, 2026
ac1a870
Revert changes to test_fil.py
chyunsu3 May 9, 2026
ace3579
Fix up compat layer for FIL
chyunsu3 May 9, 2026
4db26c0
Set convert_dtype=True before passing array to nvForest
chyunsu3 May 9, 2026
a27e367
Document of removal of FIL in 26.10
chyunsu3 May 9, 2026
236c320
Fix FIL attributes
chyunsu3 May 9, 2026
b7efba9
Filter libnvforest++.so in auditwheel
chyunsu3 May 9, 2026
285da42
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 12, 2026
a4034a2
Fix pytests
chyunsu3 May 12, 2026
1f2bcdc
Address review comments from coderabbitai
chyunsu3 May 12, 2026
6b4ad22
Address review comments from coderabbitai
chyunsu3 May 12, 2026
7819494
Fix pytests
chyunsu3 May 12, 2026
93b2099
Save suppress_deprecation_warning
chyunsu3 May 12, 2026
3b68c17
Address review comments from coderabbitai
chyunsu3 May 12, 2026
9040db0
Merge branch 'main' into adopt_nvforest
chyunsu3 May 12, 2026
0f84607
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 12, 2026
60b57e6
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 12, 2026
d705cb8
Load libnvforest first in wheel
chyunsu3 May 13, 2026
7cafa13
Merge remote-tracking branch 'origin/main' into adopt_nvforest
chyunsu3 May 13, 2026
a121230
Merge remote-tracking branch 'origin/release/26.06' into adopt_nvforest
chyunsu3 May 18, 2026
726ecde
Address review comments about input validation
chyunsu3 May 18, 2026
8abf045
Merge remote-tracking branch 'origin/release/26.06' into adopt_nvforest
chyunsu3 May 19, 2026
0b5c203
Add deprecation notice
chyunsu3 May 20, 2026
c4f7800
Emit warning for set_fil_device_type
chyunsu3 May 20, 2026
28619f5
Add back as_fil()
chyunsu3 May 20, 2026
5df218e
Merge branch 'release/26.06' into adopt_nvforest
chyunsu3 May 20, 2026
44cc3b7
Add missing import
chyunsu3 May 20, 2026
e3975a3
Fix pytests
chyunsu3 May 20, 2026
26842e2
Address reviewer's comments
chyunsu3 May 21, 2026
1ef4a77
Correctly handle case where treelite_model is bytes
chyunsu3 May 21, 2026
6c360ec
Turn FIL.rst into a stub
chyunsu3 May 21, 2026
7438c88
Fix rst syntax
chyunsu3 May 21, 2026
8ff774a
Update DEPENDENCIES
chyunsu3 May 21, 2026
c7f90af
Address reviewer comments
chyunsu3 May 21, 2026
2bdc95c
Merge remote-tracking branch 'origin/release/26.06' into adopt_nvforest
chyunsu3 May 21, 2026
fab3c3c
Alphabetize wheel library excludes
csadorf May 21, 2026
f1ae0ca
Centralize nvForest CMake target name
csadorf May 21, 2026
ff1a636
Address nvForest test review nits
csadorf May 21, 2026
6eba05b
Align RF as_fil deprecation docs
csadorf May 21, 2026
c51b0c3
Reuse cached nvForest model for RF OOB scoring
csadorf May 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/build_wheel_cuml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ EXCLUDE_ARGS=(
--exclude "libcusparse.so.*"
--exclude "libnvJitLink.so.*"
--exclude "librapids_logger.so"
--exclude "libnvforest++.so"
Comment thread
chyunsu3 marked this conversation as resolved.
Resolved
--exclude "librmm.so"
)

Expand Down
1 change: 1 addition & 0 deletions ci/build_wheel_libcuml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ EXCLUDE_ARGS=(
--exclude "libnvJitLink.so.*"
--exclude "librapids_logger.so"
--exclude "librmm.so"
--exclude "libnvforest++.so"
--exclude "libnccl.so.*"
)

Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libopenblas<=0.3.30
- libraft==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
Expand All @@ -50,6 +51,7 @@ dependencies:
- numpy>=1.26,<3.0
- numpydoc
- numpydoc<1.9
- nvforest==26.6.*,>=0.0.0a0
- nvidia-ml-py>=12
- onnxruntime
- packaging
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- lightgbm
Expand All @@ -49,6 +50,7 @@ dependencies:
- numpy>=1.26,<3.0
- numpydoc
- numpydoc<1.9
- nvforest==26.6.*,>=0.0.0a0
- nvidia-ml-py>=12
- onnxruntime
- packaging
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-132_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libopenblas<=0.3.30
- libraft==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
Expand All @@ -50,6 +51,7 @@ dependencies:
- numpy>=1.26,<3.0
- numpydoc
- numpydoc<1.9
- nvforest==26.6.*,>=0.0.0a0
- nvidia-ml-py>=12
- onnxruntime
- packaging
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-132_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- lightgbm
Expand All @@ -49,6 +50,7 @@ dependencies:
- numpy>=1.26,<3.0
- numpydoc
- numpydoc<1.9
- nvforest==26.6.*,>=0.0.0a0
- nvidia-ml-py>=12
- onnxruntime
- packaging
Expand Down
1 change: 1 addition & 0 deletions conda/environments/clang_tidy_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft-headers==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- llvm-openmp==20.1.8
Expand Down
1 change: 1 addition & 0 deletions conda/environments/clang_tidy_cuda-132_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft-headers==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- llvm-openmp==20.1.8
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cpp_all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft-headers==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- ninja
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cpp_all_cuda-132_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies:
- libcusolver-dev
- libcusparse-dev
- libcuvs==26.6.*,>=0.0.0a0
- libnvforest==26.6.*,>=0.0.0a0
- libraft-headers==26.6.*,>=0.0.0a0
- librmm==26.6.*,>=0.0.0a0
- ninja
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/cuml/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ requirements:
- cudf =${{ minor_version }}
- cython >=3.2.2
- libcuml =${{ version }}
- nvforest =${{ minor_version }}
- pip
- pylibraft =${{ minor_version }}
- python =${{ py_abi_min }}
Expand All @@ -101,6 +102,7 @@ requirements:
- numba >=0.60.0,<0.65.0
- numba-cuda >=0.22.2,<0.29.0
- numpy >=1.26,<3.0
- nvforest =${{ minor_version }}
- scikit-learn >=1.4
- scipy >=1.14.0
- packaging
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/libcuml/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ outputs:
- cuda-version =${{ cuda_version }}
- rapids-logger =0.2
- libcuvs =${{ minor_version }}
- libnvforest =${{ minor_version }}
- librmm =${{ minor_version }}
- treelite ${{ treelite_version }}
- cuda-cudart-dev
Expand All @@ -122,6 +123,7 @@ outputs:
- libcusolver
- libcusparse
- libcuvs =${{ minor_version }}
- libnvforest =${{ minor_version }}
- librmm =${{ minor_version }}
- rapids-logger =0.2
- treelite ${{ treelite_version }}
Expand Down
48 changes: 12 additions & 36 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ option(CUML_COMPILE_DYNAMIC_ONLY "Only build the shared library and skip the sta
# dependent library.
option(CUML_EXCLUDE_RAFT_FROM_ALL "Exclude RAFT targets from cuML's 'all' target" OFF)
option(CUML_EXCLUDE_TREELITE_FROM_ALL "Exclude Treelite targets from cuML's 'all' target" OFF)
option(CUML_EXCLUDE_NVFOREST_FROM_ALL "Exclude nvForest targets from cuML's 'all' target" OFF)
option(CUML_RAFT_CLONE_ON_PIN "Explicitly clone RAFT branch when pinned to non-feature branch" ON)
option(CUML_CUVS_CLONE_ON_PIN "Explicitly clone CUVS branch when pinned to non-feature branch" ON)
option(CUML_NVFOREST_CLONE_ON_PIN
"Explicitly clone nvForest branch when pinned to non-feature branch" ON
)

message(VERBOSE "CUML_CPP: Building libcuml shared library: ${BUILD_CUML_CPP_LIBRARY}")
message(VERBOSE "CUML_CPP: Building cuML algorithm tests: ${BUILD_CUML_TESTS}")
Expand Down Expand Up @@ -270,6 +274,10 @@ if(LINK_TREELITE)
include(cmake/thirdparty/get_treelite.cmake)
endif()

if(LINK_NVFOREST)
include(cmake/thirdparty/get_nvforest.cmake)
endif()

if(all_algo OR treeshap_algo)
include(cmake/thirdparty/get_gputreeshap.cmake)
endif()
Expand Down Expand Up @@ -367,42 +375,6 @@ if(BUILD_CUML_CPP_LIBRARY)
target_sources(cuml_objs PRIVATE src/explainer/tree_shap.cu)
endif()

# FIL components
if(all_algo OR fil_algo)
if(CUML_ENABLE_GPU)
target_sources(
cuml_objs
PRIVATE src/fil/infer0.cu
src/fil/infer1.cu
src/fil/infer2.cu
src/fil/infer3.cu
src/fil/infer4.cu
src/fil/infer5.cu
src/fil/infer6.cu
src/fil/infer7.cu
src/fil/infer8.cu
src/fil/infer9.cu
src/fil/infer10.cu
src/fil/infer11.cu
)
endif()
target_sources(
cuml_objs
PRIVATE src/fil/infer0.cpp
src/fil/infer1.cpp
src/fil/infer2.cpp
src/fil/infer3.cpp
src/fil/infer4.cpp
src/fil/infer5.cpp
src/fil/infer6.cpp
src/fil/infer7.cpp
src/fil/infer8.cpp
src/fil/infer9.cpp
src/fil/infer10.cpp
src/fil/infer11.cpp
)
endif()

# todo: organize linear models better
if(all_algo
OR linearregression_algo
Expand Down Expand Up @@ -596,6 +568,10 @@ if(BUILD_CUML_CPP_LIBRARY)
copy_interface_excludes(INCLUDED_TARGET treelite::treelite_static TARGET cuml_objs)
endif()

if(LINK_NVFOREST)
list(APPEND _cuml_cpp_public_libs nvforest::nvforest++)
endif()

# These are always private:
list(
APPEND
Expand Down
3 changes: 1 addition & 2 deletions cpp/bench/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =============================================================================
# cmake-format: off
# SPDX-FileCopyrightText: Copyright (c) 2019-2025, NVIDIA CORPORATION.
# SPDX-FileCopyrightText: Copyright (c) 2019-2026, NVIDIA CORPORATION.
# SPDX-License-Identifier: Apache-2.0
# cmake-format: on
# =============================================================================
Expand All @@ -24,7 +24,6 @@ if(BUILD_CUML_BENCH)
sg/svc.cu
sg/svr.cu
sg/umap.cu
sg/fil.cu
)
if(CUML_ENABLE_GPU)
target_compile_definitions(${CUML_CPP_BENCH_TARGET} PUBLIC CUML_ENABLE_GPU)
Expand Down
Loading
Loading