From 37ae63df3278851b4e0fc0551de592d4d44e232c Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Mon, 7 Dec 2020 11:54:50 -0500 Subject: [PATCH 01/32] FIX Xgboost version is based on rapids minor version --- conda/recipes/rapids-xgboost/meta.yaml | 2 +- conda/recipes/versions.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 1677d20a..09a6b04a 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -38,7 +38,7 @@ requirements: - cudatoolkit ={{ cuda_version }}.* - nccl {{ nccl_version }} - python - - xgboost {{ xgboost_version }} + - xgboost {{ xgboost_version }}{{ minor_version }} about: home: http://rapids.ai/ diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index ec7068d9..75b44c21 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -8,7 +8,8 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: - - '=1.3.0dev.rapidsai0.17' + # Minor version is appended in meta.yaml + - '=1.3.0dev.rapidsai' # Versions for conda conda_version: From 52fc6c72bb7fd4db58f92c26fb3034a073dfa190 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 9 Dec 2020 14:55:27 -0600 Subject: [PATCH 02/32] Add pytest-xdist --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 95f6e696..e80814c7 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -116,6 +116,7 @@ requirements: - pytest-benchmark - pytest-cov - pytest-timeout + - pytest-xdist - python - python-confluent-kafka {{ python_confluent_kafka_version }} - python-louvain From fc061588494e85ff593b08a1bdfcecc275be3e20 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 9 Dec 2020 14:57:29 -0600 Subject: [PATCH 03/32] parallelize pytests in cudf --- ci/test/cudf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/cudf.sh b/ci/test/cudf.sh index ff3e9dd2..87c7e4ef 100644 --- a/ci/test/cudf.sh +++ b/ci/test/cudf.sh @@ -34,7 +34,7 @@ export PYTHONPATH=\ ${PYTHONPATH} cd /rapids/cudf/python/cudf -py.test --junitxml=${TESTRESULTS_DIR}/pytest-cudf.xml -v +py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-cudf.xml -v exitcode=$? if (( ${exitcode} != 0 )); then SUITEERROR=${exitcode} @@ -42,7 +42,7 @@ if (( ${exitcode} != 0 )); then fi cd /rapids/cudf/python/dask_cudf -py.test --junitxml=${TESTRESULTS_DIR}/pytest-dask-cudf.xml -v +py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-dask-cudf.xml -v exitcode=$? if (( ${exitcode} != 0 )); then SUITEERROR=${exitcode} From 182ce449def4bbe792a91c09bf37ddbe4d47bb6e Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:51:34 -0500 Subject: [PATCH 04/32] ENH Remove 0.17 from branch-0.18 Remove 0.17 config from `ci/axis` files now that code freeze has hit and we're on separate branches prior to release --- ci/axis/nightly.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 130cd137..706049f4 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -6,7 +6,6 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 0.17.0a - 0.18.0a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container From b59ec6d8b40a9c158a2afb84ee12e97aeb5bac6f Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:52:37 -0500 Subject: [PATCH 05/32] ENH Remove 0.17 from branch-0.18 --- ci/axis/release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 9d9fc191..82eb771f 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -6,7 +6,6 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - 0.17.0 - 0.18.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container From be863988917a4190bdc5000251210a89ff9f0fc5 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:52:55 -0500 Subject: [PATCH 06/32] ENH Remove 0.17 from branch-0.18 --- ci/axis/tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 65fbd19b..5f628e64 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -6,7 +6,6 @@ DOCKER_REPO: # Use M.X (major.minor) version RAPIDS_VER: - - 0.17 - 0.18 CUDA_VER: From 92859eca75f41fceedb5d6c5de9b7f5869fdfb39 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 17:23:46 -0500 Subject: [PATCH 07/32] FIX Allow blazing meta pkgs to fail Enables uploads for other pkgs while we get the foundation pkgs out --- ci/cpu/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 302f1f44..60a4945f 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -120,7 +120,9 @@ if [[ "$BUILD_PKGS" == "meta" || -z "$BUILD_PKGS" ]] ; then # Run builds for meta-pkgs run_builds $CONDA_XGBOOST_RECIPE run_builds $CONDA_RAPIDS_RECIPE + set +e run_builds $CONDA_RAPIDS_BLAZING_RECIPE + set -e fi if [[ "$BUILD_PKGS" == "env" || -z "$BUILD_PKGS" ]] ; then From 58a69a17ae95f693bb06834b5c8c7a4f72bf3e67 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 17:58:09 -0500 Subject: [PATCH 08/32] FIX Add rapids-pytest-benchmark pkg for cugraph tests Follows #190 Applies patch to branch-0.18 --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 95f6e696..4437fc81 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -120,6 +120,7 @@ requirements: - python-confluent-kafka {{ python_confluent_kafka_version }} - python-louvain - rapidjson {{ rapidjson_version }} + - rapids-pytest-benchmark - ripgrep - s3fs - setuptools From dbcd6b6890fb9befa92b20f6fd8c04f06b60e056 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Wed, 9 Dec 2020 20:40:20 -0500 Subject: [PATCH 09/32] FIX Add channel selector for rapids-pytest-benchmark Also add `asvdb` as it is needed by `rapids-pytest-benchmark` but only in the `rapidsai` channel --- conda/recipes/rapids-build-env/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 4437fc81..c2478304 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -37,6 +37,7 @@ requirements: run: - arrow-cpp {{ arrow_version }} - arrow-cpp-proc * cuda + - rapidsai::asvdb - autoconf - automake - benchmark {{ benchmark_version }} @@ -120,7 +121,7 @@ requirements: - python-confluent-kafka {{ python_confluent_kafka_version }} - python-louvain - rapidjson {{ rapidjson_version }} - - rapids-pytest-benchmark + - rapidsai::rapids-pytest-benchmark - ripgrep - s3fs - setuptools From 4f6245615c2f6a9534447c20897d2b32b2614ff7 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Thu, 10 Dec 2020 00:51:04 -0500 Subject: [PATCH 10/32] REV Remove channel pins for asvdb/rapids-pytest-benchmark Without the channel specified the channel pins do not work; removing them and uploading asvdb to the `rapidsai-nightly` channel to fix the failing builds --- conda/recipes/rapids-build-env/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index c2478304..0136ebd4 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -37,7 +37,7 @@ requirements: run: - arrow-cpp {{ arrow_version }} - arrow-cpp-proc * cuda - - rapidsai::asvdb + - asvdb - autoconf - automake - benchmark {{ benchmark_version }} @@ -121,7 +121,7 @@ requirements: - python-confluent-kafka {{ python_confluent_kafka_version }} - python-louvain - rapidjson {{ rapidjson_version }} - - rapidsai::rapids-pytest-benchmark + - rapids-pytest-benchmark - ripgrep - s3fs - setuptools From c15989d234d7245b8f7a89cb95a79a527c8f1e5d Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 10 Dec 2020 11:38:28 -0600 Subject: [PATCH 11/32] Parallelize custreamz pytests --- ci/test/cudf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/cudf.sh b/ci/test/cudf.sh index 87c7e4ef..a899be88 100644 --- a/ci/test/cudf.sh +++ b/ci/test/cudf.sh @@ -50,7 +50,7 @@ if (( ${exitcode} != 0 )); then fi cd /rapids/cudf/python/custreamz -py.test --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v +py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v exitcode=$? if (( ${exitcode} != 0 )); then SUITEERROR=${exitcode} From a4ef8533ef049ac24eb2be677907cb76a5595633 Mon Sep 17 00:00:00 2001 From: Ashwin Srinath Date: Thu, 10 Dec 2020 16:34:09 -0500 Subject: [PATCH 12/32] Add typing extensions --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 95f6e696..00124d1f 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -131,6 +131,7 @@ requirements: - streamz - treelite {{ treelite_version }} - twine + - typing_extensions - ucx-proc=*=gpu - ucx - umap-learn From 423f5238fd8f2b8ca081b6b3818665010f0b6ad9 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Mon, 14 Dec 2020 18:08:36 -0500 Subject: [PATCH 13/32] TST Unpin build_stack Run tests to check stability of build stack with allowing gcc 9.3 built packages from conda-forge --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 19c1460f..6097bedf 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,7 +21,7 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '=7.5.0' + - '>=7.5.0' # Shared versions across meta-pkgs arrow_version: From 7ad7b711f58cdfa30fc144d7ab0de9ad93ddbf1e Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Tue, 15 Dec 2020 23:13:19 -0500 Subject: [PATCH 14/32] Revert "ENH Open gcc pinning to allow for new conda-forge gcc 9.3 pkgs" --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 6097bedf..19c1460f 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,7 +21,7 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '>=7.5.0' + - '=7.5.0' # Shared versions across meta-pkgs arrow_version: From 0d6eeab2497f0c2b214a595da7af118647422851 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 29 Dec 2020 23:29:13 -0800 Subject: [PATCH 15/32] Upgrade to Treelite 1.0.0rc1 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 19c1460f..6f52f509 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -137,4 +137,4 @@ spdlog_version: sphinx_markdown_tables_version: - '=0.0.14=pyh9f0ad1d_1' treelite_version: - - '=0.93' + - '=1.0.0rc1' From bdd933787f0e2bd70a98c5f92f032f43f8b6dcda Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Wed, 30 Dec 2020 12:46:33 -0800 Subject: [PATCH 16/32] Try libgcc 9.3.0 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 6f52f509..e01fc4ef 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,7 +21,7 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '=7.5.0' + - '=9.3.0' # Shared versions across meta-pkgs arrow_version: From 8596d02b1f8ca35eb4aceca1aa5946519c06c68b Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 4 Jan 2021 16:43:57 -0800 Subject: [PATCH 17/32] Revert "Try libgcc 9.3.0" This reverts commit bdd933787f0e2bd70a98c5f92f032f43f8b6dcda. --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index e01fc4ef..6f52f509 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,7 +21,7 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '=9.3.0' + - '=7.5.0' # Shared versions across meta-pkgs arrow_version: From 501066df6bf8bc040b738efd0f0f17c971e4f477 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Wed, 13 Jan 2021 01:42:42 -0500 Subject: [PATCH 18/32] upgrade build stack to 9.3.0 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 6f52f509..e01fc4ef 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,7 +21,7 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '=7.5.0' + - '=9.3.0' # Shared versions across meta-pkgs arrow_version: From 689e1a1b1cff14e9821fac920021c14222de3ad1 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Wed, 13 Jan 2021 03:21:25 -0500 Subject: [PATCH 19/32] bump scipy patch version to fix fortran version issue --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index e01fc4ef..e93b9a16 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -129,7 +129,7 @@ s3fs_version: scikit_learn_version: - '=0.23.1' scipy_version: - - '=1.5.1' + - '=1.5.3' setuptools_version: - '>=49,<50' spdlog_version: From c7a0293a378c718c936a70d54634c1142e88d350 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 15 Jan 2021 09:53:46 +1300 Subject: [PATCH 20/32] Pin gdal to 3.1.x --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 6f52f509..ab644545 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -69,7 +69,7 @@ flatbuffers_version: fsspec_version: - '>=0.6.0' gdal_version: - - '>=3.0.2,<3.1.0a0' + - '>=3.1.0,<3.2.0a0' geopandas_version: - '>=0.6, <=0.8.1' google_cloud_cpp_version: From 2c17e05df02a59bac6f1c40db4b52180d39894ac Mon Sep 17 00:00:00 2001 From: Ayush Dattagupta Date: Fri, 15 Jan 2021 16:54:44 -0800 Subject: [PATCH 21/32] Add version spec for moto for build env. Update s3fs version spec --- conda/recipes/rapids-build-env/meta.yaml | 4 ++-- conda/recipes/rapids-notebook-env/meta.yaml | 2 +- conda/recipes/versions.yaml | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 81521f68..615db909 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -93,7 +93,7 @@ requirements: - lightgbm - make - mimesis - - moto + - moto {{ moto_version }} - mypy {{ mypy_version }} - nccl {{ nccl_version }} - networkx {{ networkx_version }} @@ -124,7 +124,7 @@ requirements: - rapidjson {{ rapidjson_version }} - rapids-pytest-benchmark - ripgrep - - s3fs + - s3fs {{ s3fs_version }} - setuptools - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 70fda447..8e5babca 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -54,7 +54,7 @@ requirements: - networkx {{ networkx_version }} - nodejs {{ nodejs_version }} - pytest - - s3fs + - s3fs {{ s3fs_version }} - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} - seaborn diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index ab644545..7c568f02 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -86,6 +86,8 @@ jupyterlab_version: - '=2.1' librdkafka_version: - '=1.5.*' +moto_version: + - '>=1.3.14' mypy_version: - '0.782' nccl_version: @@ -125,7 +127,7 @@ pytest_asyncio_version: rapidjson_version: - '=1.1.0' s3fs_version: - - '>=0.5.1' + - '>=0.5.2' scikit_learn_version: - '=0.23.1' scipy_version: From 9ba3421853c7c661c809b5f68d8f597fbd9562f9 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Tue, 19 Jan 2021 09:32:43 -0600 Subject: [PATCH 22/32] FIX Update cupy to >= 7.8 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index ab644545..e1244312 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -43,7 +43,7 @@ cmake_format_version: cmake_setuptools_version: - '>=0.1.3' cupy_version: - - '>7.1.0,<9.0.0a0' + - '>7.8.0,<9.0.0a0' cython_version: - '>=0.29.17,<0.30' dask_version: From 3ca640f6054f43ba785d0b28ae82ffe8eb24f748 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Tue, 19 Jan 2021 09:34:38 -0600 Subject: [PATCH 23/32] FIX Typo in cupy >= 7.8 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index e1244312..dabb55a8 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -43,7 +43,7 @@ cmake_format_version: cmake_setuptools_version: - '>=0.1.3' cupy_version: - - '>7.8.0,<9.0.0a0' + - '>=7.8.0,<9.0.0a0' cython_version: - '>=0.29.17,<0.30' dask_version: From 2cf71f890996063b40fc96f1f0c96c91f0b7efb0 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 20 Jan 2021 16:28:31 -0800 Subject: [PATCH 24/32] update panel version dependency --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index ffcbe9ca..15a27a57 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -106,7 +106,7 @@ pandas_version: pandoc_version: - '<=2.0.0' panel_version: - - '>=0.9.1, <=0.9.7' + - '>=0.10.3' pydeck_version: - '>=0.3, <=0.5.0' python_confluent_kafka_version: From f8b0b4d1bd754e40e81672cdb868cf473c4a999b Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Thu, 21 Jan 2021 06:12:33 -0800 Subject: [PATCH 25/32] Upgrade to Treelite 1.0.0 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 7c568f02..c3a11d79 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -139,4 +139,4 @@ spdlog_version: sphinx_markdown_tables_version: - '=0.0.14=pyh9f0ad1d_1' treelite_version: - - '=1.0.0rc1' + - '=1.0.0' From aa915fd8902f7ad7b3c4f9dd032b25bc409f9548 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Wed, 3 Feb 2021 11:12:29 -0500 Subject: [PATCH 26/32] ENH Add v0.19 to nightly & tests --- ci/axis/nightly.yaml | 1 + ci/axis/tests.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 3228e47a..1776f183 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -7,6 +7,7 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - 0.18.0a + - 0.19.0a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 5f628e64..f1b6e970 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -7,6 +7,7 @@ DOCKER_REPO: # Use M.X (major.minor) version RAPIDS_VER: - 0.18 + - 0.19 CUDA_VER: - 11.0 From 4788b9d37c1a0a369536b756ba9383f4f661441d Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 10 Feb 2021 17:56:58 -0500 Subject: [PATCH 27/32] update nodejs spec --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 004ee719..9b9067ae 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -95,7 +95,7 @@ nccl_version: networkx_version: - '>=2.3' nodejs_version: - - '>=12' + - '>=12,<15' numba_version: - '>=0.51.2' numpy_version: From 3649a60d1bea1f37200c23c1565d09094b95f0c4 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Thu, 11 Feb 2021 10:20:35 -0500 Subject: [PATCH 28/32] FIX Bump xgboost to 1.3.3 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 004ee719..a00bd239 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -9,7 +9,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: # Minor version is appended in meta.yaml - - '=1.3.0dev.rapidsai' + - '=1.3.3dev.rapidsai' # Versions for conda conda_version: From 22fcff8fe412346b72e73bfd932f732d6aa63d8a Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 11 Feb 2021 09:39:13 -0600 Subject: [PATCH 29/32] adding pyorc to build env --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 615db909..661d1377 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -110,6 +110,7 @@ requirements: - pyarrow {{ arrow_version }} - pydeck {{ pydeck_version }} - pynvml + - pyorc - pyppeteer {{ pyppeteer_version }} - pyproj {{ pyproj_version }} - pytest From 83250b3e1d9b67ac22aba4e62d91169f52cdc5a7 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Thu, 11 Feb 2021 16:18:37 -0500 Subject: [PATCH 30/32] add sort=True to groupby --- test/cudf/test_diningparty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cudf/test_diningparty.py b/test/cudf/test_diningparty.py index 4b6c847a..35180265 100644 --- a/test/cudf/test_diningparty.py +++ b/test/cudf/test_diningparty.py @@ -12,7 +12,7 @@ def test_diningparty() : tips_df['tip_percentage'] = tips_df['tip']/tips_df['total_bill']*100 # compute the average tip by dining party size - cudfSeries = tips_df.groupby('size').tip_percentage.mean() + cudfSeries = tips_df.groupby('size', sort=True).tip_percentage.mean() # the expected average tip percentage for parties sized 1, 2, 3, # etc. for the data set. From 0411f46d26a9aac426511b3615020f709ec149ae Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Thu, 11 Feb 2021 17:31:29 -0500 Subject: [PATCH 31/32] set a relative tolerance to 1e-3, this is mostly a test that cugraph works not a test of pagerank behavior --- test/cugraph/test_pagerank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cugraph/test_pagerank.py b/test/cugraph/test_pagerank.py index 68f7edca..88608ce6 100644 --- a/test/cugraph/test_pagerank.py +++ b/test/cugraph/test_pagerank.py @@ -100,4 +100,4 @@ def test_pagerank() : assert len(expectedPageRanks) == len(gdf_page["pagerank"]) for (actual, expected) in zip(gdf_page["pagerank"].to_pandas(), expectedPageRanks): - assert actual == pytest.approx(expected) + assert actual == pytest.approx(expected, rel=1e-3) From 50a1c65aaf0d2876629998aa6927dbcf352e8f9a Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Fri, 12 Feb 2021 10:45:13 -0800 Subject: [PATCH 32/32] ENH Add ninja to build environment --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 615db909..00fc1d05 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -97,6 +97,7 @@ requirements: - mypy {{ mypy_version }} - nccl {{ nccl_version }} - networkx {{ networkx_version }} + - ninja - nltk - numba {{ numba_version }} - numpy {{ numpy_version }}