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 Treelite to 3.1.0 #5146

Merged
merged 5 commits into from
Jan 24, 2023
+14 −11
Merged

Upgrade Treelite to 3.1.0 #5146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2282aea
Upgrade Treelite to 3.1.0
hcho3 Jan 21, 2023
5e31ba7
Reviewer's comment
hcho3 Jan 23, 2023
2eb8683
Reviewer's comment
hcho3 Jan 23, 2023
b65526e
Merge remote-tracking branch 'origin/branch-23.02' into upgrade_treelite
hcho3 Jan 23, 2023
97495a1
Update setup.py and pyproject.toml
hcho3 Jan 24, 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-115_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies:
- sphinx-markdown-tables
- statsmodels
- sysroot_linux-64==2.17
- treelite=3.0.1
- treelite=3.1.0
- umap-learn
- pip:
- git+https://github.com/dask/dask-glm@main
Expand Down
3 changes: 3 additions & 0 deletions conda/recipes/cuml/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ libcusolver_host_version:

libcusparse_host_version:
- ">=11.7.0.31,<=11.7.0.107"

treelite_version:
- "=3.1.0"
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 @@ -62,7 +62,7 @@ requirements:
- raft-dask ={{ minor_version }}
- scikit-build >=0.13.1
- setuptools
- treelite =3.0.1
- treelite {{ treelite_version }}
run:
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- cuda-python >=11.7.1,<12.0
Expand All @@ -77,7 +77,7 @@ requirements:
- pylibraft ={{ minor_version }}
- python x.x
- raft-dask ={{ minor_version }}
- treelite =3.0.1
- treelite {{ treelite_version }}

# TODO: Remove the linux64 tags on tests after disabling gpuCI / Jenkins
tests: # [linux64]
Expand Down
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 @@ -14,7 +14,7 @@ cmake_version:
- ">=3.23.1,!=3.25.0"

treelite_version:
- "=3.0.1"
- "=3.1.0"

gtest_version:
- "=1.10.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 @@ -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.0.1
PINNED_TAG cb09d539dce7e67f60cc33e4fac6b95b7185847a
find_and_configure_treelite(VERSION 3.1.0
PINNED_TAG 4103ed090f17ad16596c3b46357b810a5ccc3969
EXCLUDE_FROM_ALL ${CUML_EXCLUDE_TREELITE_FROM_ALL}
BUILD_STATIC_LIBS ${CUML_USE_TREELITE_STATIC})
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ dependencies:
- cuda-python>=11.7.1,<12.0
- scikit-build>=0.13.1
- cython>=0.29,<0.30
- treelite=3.0.1
- treelite=3.1.0
- output_types: conda
packages:
- cudf=23.02.*
Expand Down
4 changes: 2 additions & 2 deletions python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ requires = [
"scikit-build>=0.13.1",
"cmake>=3.23.1,!=3.25.0",
"ninja",
"treelite==3.0.1",
"treelite_runtime==3.0.1",
"treelite==3.1.0",
"treelite_runtime==3.1.0",
"versioneer",
]
build-backend = "backend"
Expand Down
4 changes: 2 additions & 2 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ def get_versions():
"numba",
"scipy",
"seaborn",
"treelite==3.0.1",
"treelite_runtime==3.0.1",
"treelite==3.1.0",
"treelite_runtime==3.1.0",
f"cudf{cuda_suffix}",
f"dask-cudf{cuda_suffix}",
f"pylibraft{cuda_suffix}",
Expand Down