From e48fff0b842a31c8cb92d4c76caf5c450d7a0d54 Mon Sep 17 00:00:00 2001 From: Hyunsu Philip Cho Date: Mon, 23 May 2022 12:14:16 -0700 Subject: [PATCH] Upgrade Treelite to 2.4.0 --- ci/gpu/build.sh | 5 +++++ conda/environments/cuml_dev_cuda11.0.yml | 2 +- conda/environments/cuml_dev_cuda11.2.yml | 2 +- conda/environments/cuml_dev_cuda11.4.yml | 2 +- conda/environments/cuml_dev_cuda11.5.yml | 2 +- conda/recipes/cuml/meta.yaml | 4 ++-- conda/recipes/libcuml/conda_build_config.yaml | 2 +- cpp/cmake/thirdparty/get_treelite.cmake | 4 ++-- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index aca1eb7ec3..10a3aa2c91 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -73,6 +73,11 @@ if [ "$(arch)" = "x86_64" ]; then "rapids-doc-env=${MINOR_VERSION}.*" fi +gpuci_conda_retry remove -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \ + --force rapids-build-env rapids-notebook-env +gpuci_mamba_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \ + treelite=2.4.0 + # https://docs.rapids.ai/maintainers/depmgmt/ # gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env # gpuci_mamba_retry install -y "your-pkg=1.0.0" diff --git a/conda/environments/cuml_dev_cuda11.0.yml b/conda/environments/cuml_dev_cuda11.0.yml index 326342d5bf..27f9a41504 100644 --- a/conda/environments/cuml_dev_cuda11.0.yml +++ b/conda/environments/cuml_dev_cuda11.0.yml @@ -28,7 +28,7 @@ dependencies: - faiss-proc=*=cuda - umap-learn - scikit-learn=0.24 -- treelite=2.3.0 +- treelite=2.4.0 - statsmodels - seaborn - hdbscan diff --git a/conda/environments/cuml_dev_cuda11.2.yml b/conda/environments/cuml_dev_cuda11.2.yml index 1c1b32a36a..87e168c664 100644 --- a/conda/environments/cuml_dev_cuda11.2.yml +++ b/conda/environments/cuml_dev_cuda11.2.yml @@ -28,7 +28,7 @@ dependencies: - faiss-proc=*=cuda - umap-learn - scikit-learn=0.24 -- treelite=2.3.0 +- treelite=2.4.0 - statsmodels - seaborn - hdbscan diff --git a/conda/environments/cuml_dev_cuda11.4.yml b/conda/environments/cuml_dev_cuda11.4.yml index 9629e14603..e7783b6bd5 100644 --- a/conda/environments/cuml_dev_cuda11.4.yml +++ b/conda/environments/cuml_dev_cuda11.4.yml @@ -28,7 +28,7 @@ dependencies: - faiss-proc=*=cuda - umap-learn - scikit-learn=0.24 -- treelite=2.3.0 +- treelite=2.4.0 - statsmodels - seaborn - hdbscan diff --git a/conda/environments/cuml_dev_cuda11.5.yml b/conda/environments/cuml_dev_cuda11.5.yml index 095925ec7a..deac8d732d 100644 --- a/conda/environments/cuml_dev_cuda11.5.yml +++ b/conda/environments/cuml_dev_cuda11.5.yml @@ -28,7 +28,7 @@ dependencies: - faiss-proc=*=cuda - umap-learn - scikit-learn=0.24 -- treelite=2.3.0 +- treelite=2.4.0 - statsmodels - seaborn - hdbscan diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 8e7e86cd6a..bdd460c17f 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -35,7 +35,7 @@ requirements: - python x.x - setuptools - cython>=0.29,<0.30 - - treelite=2.3.0 + - treelite=2.4.0 - cudf {{ minor_version }} - libcuml={{ version }} - libcumlprims {{ minor_version }} @@ -52,7 +52,7 @@ requirements: - libcumlprims {{ minor_version }} - pyraft {{ minor_version }} - cupy>=7.8.0,<11.0.0a0 - - treelite=2.3.0 + - treelite=2.4.0 - nccl>=2.9.9 - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml index 0d892e2eb7..1cbc8e1619 100644 --- a/conda/recipes/libcuml/conda_build_config.yaml +++ b/conda/recipes/libcuml/conda_build_config.yaml @@ -20,7 +20,7 @@ ucx_version: - "1.12.1" treelite_version: - - "2.3.0" + - "2.4.0" gtest_version: - "1.10.0" diff --git a/cpp/cmake/thirdparty/get_treelite.cmake b/cpp/cmake/thirdparty/get_treelite.cmake index 71aba99763..9e10953c93 100644 --- a/cpp/cmake/thirdparty/get_treelite.cmake +++ b/cpp/cmake/thirdparty/get_treelite.cmake @@ -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 2.3.0 - PINNED_TAG b65bedceef9893c1ad92977dd466f582540ba7ab +find_and_configure_treelite(VERSION 2.4.0 + PINNED_TAG dcd54779ce9324c69452db9b906f2d258374d5b9 BUILD_STATIC_LIBS ${CUML_USE_TREELITE_STATIC})