Skip to content

Commit

Permalink
Merge pull request rapidsai#4227 from rapidsai/branch-21.10
Browse files Browse the repository at this point in the history
[gpuCI] Forward-merge branch-21.10 to branch-21.12 [skip gpuci]
  • Loading branch information
GPUtester authored Sep 23, 2021
2 parents cfceb40 + 70f97c5 commit 86bfebf
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
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 @@ -22,7 +22,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=2.0.0
- treelite=2.1.0
- statsmodels
- seaborn
- hdbscan
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 @@ -22,7 +22,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=2.0.0
- treelite=2.1.0
- statsmodels
- seaborn
- hdbscan
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 @@ -22,7 +22,7 @@ dependencies:
- faiss-proc=*=cuda
- umap-learn
- scikit-learn=0.23.1
- treelite=2.0.0
- treelite=2.1.0
- statsmodels
- seaborn
- hdbscan
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.20.1
- treelite=2.0.0
- treelite=2.1.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=2.0.0
- treelite=2.1.0
- nccl>=2.9.9
- ucx-py 0.22
- ucx-proc=*=gpu
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 @@ -43,7 +43,7 @@ requirements:
- ucx-proc=*=gpu
- libcumlprims {{ minor_version }}
- lapack
- treelite=2.0.0
- treelite=2.1.0
- faiss-proc=*=cuda
- gtest=1.10.0
- gmock
Expand All @@ -55,7 +55,7 @@ requirements:
- ucx-py 0.22
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- treelite=2.0.0
- treelite=2.1.0
- faiss-proc=*=cuda
- libfaiss 1.7.0 *_cuda

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 @@ -54,5 +54,5 @@ function(find_and_configure_treelite)

endfunction()

find_and_configure_treelite(VERSION 2.0.0
PINNED_TAG b117da58d7d9a5cc54aa3711e5ad9a8407734c6e)
find_and_configure_treelite(VERSION 2.1.0
PINNED_TAG e5248931c62e3807248e0b150e27b2530a510634)

0 comments on commit 86bfebf

Please sign in to comment.