Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
- PR #2943: Remove unused shuffle_features parameter
- PR #2940: Correcting labels meta dtype for `cuml.dask.make_classification`
- PR #2957: Fix ols test size for stability
- PR #2972: Upgrade Treelite to 0.93

# cuML 0.15.0 (Date TBD)

Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=0.92
- treelite=0.93

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe treelite >=0.92,<=0.93?
When we don't have a preference, it seems beneficial to be a little more flexible.

@chyunsu3 chyunsu3 Oct 13, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We actually want to avoid 0.92 and use 0.93 exclusively, to avoid conflict with BlazingSQL.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

0.93 is understood by conda as 0.93.* so we should be good to use this and pick up any patch/hotfixes

- pip
- pip:
- sphinx_markdown_tables
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=0.92
- treelite=0.93
- pip
- pip:
- sphinx_markdown_tables
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=0.92
- treelite=0.93
- pip
- pip:
- sphinx_markdown_tables
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cuml/meta.yaml
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=0.92
- treelite=0.93
- cudf {{ minor_version }}
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
Expand All @@ -40,7 +40,7 @@ requirements:
- dask-cudf {{ minor_version }}
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
- treelite=0.92
- treelite=0.93
- cupy>7.1.0,<9.0.0a0
- nccl>=2.5
- ucx-py {{ minor_version }}
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ requirements:
- ucx-py {{ minor_version }}
- libcumlprims {{ minor_version }}
- lapack
- treelite=0.92
- treelite=0.93
- faiss-proc=*=cuda
- gtest=1.10.0
- libfaiss=1.6.3
Expand All @@ -47,7 +47,7 @@ requirements:
- nccl>=2.5
- ucx-py {{ minor_version }}
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- treelite=0.92
- treelite=0.93
- faiss-proc=*=cuda
- libfaiss=1.6.3

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

find_package(Treelite 0.92 REQUIRED)
find_package(Treelite 0.93 REQUIRED)

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