Skip to content

Upgrade Treelite to 2.0.0 #4072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 3 commits into from
Jul 21, 2021
Merged

Upgrade Treelite to 2.0.0 #4072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9281495
Upgrade Treelite to 2.0.0
chyunsu3 Jul 20, 2021
d3e750d
Style fix
chyunsu3 Jul 20, 2021
a86d1e1
Use Treelite from integration
chyunsu3 Jul 20, 2021
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
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=1.3.0
- treelite=2.0.0
- statsmodels
- seaborn
- hdbscan
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=1.3.0
- treelite=2.0.0
- statsmodels
- seaborn
- hdbscan
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cuml/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ requirements:
- setuptools
- cython>=0.29,<0.30
- cmake>=3.20.1
- treelite=1.3.0
- treelite=2.0.0
- cudf {{ minor_version }}
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
Expand All @@ -42,7 +42,7 @@ requirements:
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
- cupy>=7.8.0,<10.0.0a0
- treelite=1.3.0
- treelite=2.0.0
- nccl>=2.9.9
- ucx-py 0.21
- ucx-proc=*=gpu
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcuml/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ requirements:
- ucx-proc=*=gpu
- libcumlprims {{ minor_version }}
- lapack
- treelite=1.3.0
- treelite=2.0.0
- faiss-proc=*=cuda
- gtest=1.10.0
- gmock
Expand All @@ -57,7 +57,7 @@ requirements:
- ucx-py 0.21
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- treelite=1.3.0
- treelite=2.0.0
- faiss-proc=*=cuda
- conda-forge::libfaiss=1.7.0

Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake/thirdparty/get_treelite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ function(find_and_configure_treelite)

endfunction()

find_and_configure_treelite(VERSION 1.3.0
PINNED_TAG ae5436c45563a5c2ed7aa8f0f41f88fff48f49e4)
find_and_configure_treelite(VERSION 2.0.0
PINNED_TAG b117da58d7d9a5cc54aa3711e5ad9a8407734c6e)
3 changes: 1 addition & 2 deletions cpp/src/randomforest/randomforest.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,7 @@ void build_treelite_forest(ModelHandle* model_handle,
model->task_type = tl::TaskType::kBinaryClfRegr;
}

model->task_param =
tl::TaskParameter{tl::TaskParameter::OutputType::kFloat, false, num_class, num_class};
model->task_param = tl::TaskParam{tl::TaskParam::OutputType::kFloat, false, num_class, num_class};
model->num_feature = num_features;
model->average_tree_output = true;
model->SetTreeLimit(forest->rf_params.n_trees);
Expand Down
6 changes: 3 additions & 3 deletions cpp/test/sg/rf_treelite_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,13 @@ class RfTreeliteTestCommon : public ::testing::TestWithParam<RfInputs<T>> {

CompilerHandle compiler;
// "ast_navive" is the default compiler treelite used in their Python code.
TREELITE_CHECK(TreeliteCompilerCreate("ast_native", &compiler));
TREELITE_CHECK(TreeliteCompilerCreateV2("ast_native", "{}", &compiler));

int verbose = 0;
// Generate C code in the directory specified below.
// The parallel comilplation is disabled. To enable it, one needs to specify parallel_comp of
// CompilerHandle. Treelite will create a directory if it doesn't exist.
TREELITE_CHECK(
TreeliteCompilerGenerateCode(compiler, treelite_indiv_handles[0], verbose, dir_name.c_str()));
TreeliteCompilerGenerateCodeV2(compiler, treelite_indiv_handles[0], dir_name.c_str()));
TREELITE_CHECK(TreeliteCompilerFree(compiler));

// Options copied from
Expand Down Expand Up @@ -135,6 +134,7 @@ class RfTreeliteTestCommon : public ::testing::TestWithParam<RfInputs<T>> {
// avoid seg faults. Altough later we only use first params.n_inference_rows elements.
size_t treelite_predicted_labels_size;

int verbose = 0;
TREELITE_CHECK(TreelitePredictorPredictBatch(predictor,
dmat,
verbose,
Expand Down