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.

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

[gpuCI] Forward-merge branch-22.12 to branch-23.02 [skip gpuci] #5040

Merged
merged 1 commit into from
Nov 30, 2022
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
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 @@ -34,7 +34,7 @@ dependencies:
- umap-learn
- scikit-learn=0.24
- sphinx-markdown-tables
- treelite=3.0.0
- treelite=3.0.1
- statsmodels
- seaborn
- nltk
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
- umap-learn
- scikit-learn=0.24
- sphinx-markdown-tables
- treelite=3.0.0
- treelite=3.0.1
- statsmodels
- seaborn
- nltk
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
- umap-learn
- scikit-learn=0.24
- sphinx-markdown-tables
- treelite=3.0.0
- treelite=3.0.1
- statsmodels
- seaborn
- nltk
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cuml_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
- umap-learn
- scikit-learn=0.24
- sphinx-markdown-tables
- treelite=3.0.0
- treelite=3.0.1
- statsmodels
- seaborn
- nltk
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 @@ -36,7 +36,7 @@ requirements:
- setuptools
- scikit-build>=0.13.1
- cython>=0.29,<0.30
- treelite=3.0.0
- treelite=3.0.1
- cudf {{ minor_version }}
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
Expand All @@ -55,7 +55,7 @@ requirements:
- pylibraft {{ minor_version }}
- raft-dask {{ minor_version }}
- cupy>=7.8.0,<12.0.0a0
- treelite=3.0.0
- treelite=3.0.1
- nccl>=2.9.9
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcuml/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ucx_version:
- "1.13.0"

treelite_version:
- "3.0.0"
- "3.0.1"

gtest_version:
- "1.10.0"
Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake/thirdparty/get_treelite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ 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.0
PINNED_TAG a8e688b7f0486227fe723229e4cbb77e3a669148
find_and_configure_treelite(VERSION 3.0.1
PINNED_TAG cb09d539dce7e67f60cc33e4fac6b95b7185847a
BUILD_STATIC_LIBS ${CUML_USE_TREELITE_STATIC})
1 change: 1 addition & 0 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ set(CUML_CPP_TARGET "cuml++")
# If the user requested it, we attempt to find cuml.
if(FIND_CUML_CPP)
include(rapids-cpm)
include(rapids-export)
rapids_cpm_init()
include(rapids-cuda)
rapids_cuda_init_architectures(cuml-python)
Expand Down