Skip to content
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

Jump to bottom

Upgrade to Treelite 3.9.1 #5581

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Upgrade to Treelite 3.9.1 #5581

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
d393413
Upgrade to Treelite 3.9.1
hcho3 Sep 14, 2023
46f04cb
Updated CMake option
hcho3 Sep 18, 2023
612530b
Merge branch 'branch-23.10' into upgrade_treelite
hcho3 Sep 20, 2023
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/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dependencies:
- sphinx<6
- statsmodels
- sysroot_linux-64==2.17
- treelite==3.2.0
- treelite==3.9.1
- umap-learn==0.5.3
- pip:
- git+https://github.com/dask/dask-glm@main
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies:
- sphinx<6
- statsmodels
- sysroot_linux-64==2.17
- treelite==3.2.0
- treelite==3.9.1
- umap-learn==0.5.3
- pip:
- git+https://github.com/dask/dask-glm@main
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ sysroot_version:
- "=2.17"

treelite_version:
- "=3.2.0"
- "=3.9.1"
2 changes: 1 addition & 1 deletion conda/recipes/libcuml/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cmake_version:
- ">=3.26.4"

treelite_version:
- "=3.2.0"
- "=3.9.1"

gtest_version:
- ">=1.13.0"
Expand Down
8 changes: 4 additions & 4 deletions cpp/cmake/thirdparty/get_treelite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2021-2022, NVIDIA CORPORATION.
# Copyright (c) 2021-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.
Expand Down Expand Up @@ -36,7 +36,7 @@ function(find_and_configure_treelite)
EXCLUDE_FROM_ALL ${PKG_EXCLUDE_FROM_ALL}
OPTIONS
"USE_OPENMP ON"
"BUILD_STATIC_LIBS ${PKG_BUILD_STATIC_LIBS}"
"Treelite_BUILD_STATIC_LIBS ${PKG_BUILD_STATIC_LIBS}"
)


Expand Down Expand Up @@ -90,7 +90,7 @@ function(find_and_configure_treelite)
rapids_export_find_package_root(BUILD Treelite [=[${CMAKE_CURRENT_LIST_DIR}]=] cuml-exports)
endfunction()

find_and_configure_treelite(VERSION 3.2.0
PINNED_TAG ee697b3b58d5f51623dd3b308f290581b58dbe5d
find_and_configure_treelite(VERSION 3.9.1
PINNED_TAG 346d92547295417676f499ce2dd4fff946b9042a
EXCLUDE_FROM_ALL ${CUML_EXCLUDE_TREELITE_FROM_ALL}
BUILD_STATIC_LIBS ${CUML_USE_TREELITE_STATIC})
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ dependencies:
packages:
- scikit-build>=0.13.1
- cython>=3.0.0
- &treelite treelite==3.2.0
- &treelite treelite==3.9.1
- pylibraft==23.10.*
- rmm==23.10.*
- output_types: pyproject
packages:
- wheel
- setuptools
- &treelite_runtime treelite_runtime==3.2.0
- &treelite_runtime treelite_runtime==3.9.1
specific:
- output_types: [conda, requirements, pyproject]
matrices:
Expand Down
8 changes: 4 additions & 4 deletions python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ requires = [
"rmm==23.10.*",
"scikit-build>=0.13.1",
"setuptools",
"treelite==3.2.0",
"treelite_runtime==3.2.0",
"treelite==3.9.1",
"treelite_runtime==3.9.1",
"wheel",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
build-backend = "setuptools.build_meta"
Expand Down Expand Up @@ -67,8 +67,8 @@ dependencies = [
"numba>=0.57",
"raft-dask==23.10.*",
"scipy>=1.8.0",
"treelite==3.2.0",
"treelite_runtime==3.2.0",
"treelite==3.9.1",
"treelite_runtime==3.9.1",
] # 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",
Expand Down