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

Upgrade to Treelite 1.2.0 #3829

Closed
wants to merge 4 commits into from
Closed

Upgrade to Treelite 1.2.0 #3829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17ceb9b
Upgrade to Treelite 1.2.0
hcho3 May 5, 2021
556fe59
Require 1.2.0+ in CMake
hcho3 May 5, 2021
003c1e5
Missing update in libcuml meta.yml
hcho3 May 5, 2021
b097e7f
Specify an exact version in find_package
hcho3 May 5, 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
4 changes: 4 additions & 0 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
"rapids-doc-env=${MINOR_VERSION}.*" \
"shap>=0.37,<=0.39"

gpuci_conda_retry remove -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
--force rapids-build-env rapids-notebook-env
gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia treelite=1.2.0
Comment on lines +64 to +66
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove these lines once Treelite is upgraded in integration.


# https://docs.rapids.ai/maintainers/depmgmt/
# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
# gpuci_conda_retry install -y "your-pkg=1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda10.1.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.1.0
- treelite=1.2.0
- pip
- pip:
- sphinx_markdown_tables
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda10.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.1.0
- treelite=1.2.0
- pip
- pip:
- sphinx_markdown_tables
Expand Down
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.1.0
- treelite=1.2.0
- pip
- pip:
- sphinx_markdown_tables
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.1.0
- treelite=1.2.0
- pip
- pip:
- sphinx_markdown_tables
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.14
- treelite=1.1.0
- treelite=1.2.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.1.0
- treelite=1.2.0
- nccl>=2.8.4
- ucx-py {{ minor_version }}
- 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.1.0
- treelite=1.2.0
- faiss-proc=*=cuda
- gtest=1.10.0
- conda-forge::libfaiss=1.7.0
Expand All @@ -56,7 +56,7 @@ requirements:
- ucx-py {{ minor_version }}
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- treelite=1.1.0
- treelite=1.2.0
- faiss-proc=*=cuda
- conda-forge::libfaiss=1.7.0

Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ endif(BUILD_STATIC_FAISS)
##############################################################################
# - treelite build -----------------------------------------------------------

find_package(Treelite 1.0.0 REQUIRED)
find_package(Treelite 1.2.0 EXACT REQUIRED)

##############################################################################
# - googletest build -----------------------------------------------------------
Expand Down