Merge branch 'branch-0.17' into cmake_3.18

ci/axis/nightly.yaml

@@ -5,7 +5,7 @@ CONDA_CONFIG_FILE:
   - conda/recipes/versions.yaml
 
 RAPIDS_VER:
-  - 0.16.0a
+  - 0.17.0a
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:

ci/axis/release.yaml

@@ -5,7 +5,7 @@ CONDA_CONFIG_FILE:
   - conda/recipes/versions.yaml
 
 RAPIDS_VER:
-  - 0.16
+  - 0.17.0
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:

ci/axis/tests.yaml

@@ -5,7 +5,7 @@ DOCKER_REPO:
   - rapidsai/rapidsai-dev-nightly
 
 RAPIDS_VER:
-  - 0.16
+  - 0.17
 
 CUDA_VER:
   - 11.0

ci/cpu/conda-pack.sh

@@ -14,7 +14,7 @@ conda install -y -c $CONDA_USERNAME -c nvidia -c conda-forge -c defaults \
     ipykernel
 
 echo "Packing conda environment"
-conda-pack --quiet -n $CONDA_ENV_NAME -o ${CONDA_ENV_NAME}.tar.gz
+conda-pack --quiet --ignore-missing-files -n $CONDA_ENV_NAME -o ${CONDA_ENV_NAME}.tar.gz
 
 export AWS_DEFAULT_REGION="us-east-2"
 echo "Upload packed conda"

ci/test/cudf.sh

@@ -15,12 +15,6 @@ TESTRESULTS_DIR=${WORKSPACE}/testresults
 mkdir -p ${TESTRESULTS_DIR}
 SUITEERROR=0
 
-# build gtests
-pushd /rapids/cudf/cpp/build
-make build_tests_cudf
-SUITEERROR=$((SUITEERROR | $?))
-popd
-
 # run gtests
 for gt in /rapids/cudf/cpp/build/gtests/*; do
    ${gt} --gtest_output=xml:${TESTRESULTS_DIR}/

ci/test/notebooks.sh

@@ -6,9 +6,23 @@ set -o pipefail
 export LIBCUDF_KERNEL_CACHE_PATH=${WORKSPACE}/.jitcache
 
 source /opt/conda/bin/activate rapids
+
+# PyTorch is intentionally excluded from our Docker images due
+# to its size, but some notebooks still depend on it.
+case "${CUDA_VER}" in
+"10.1" | "10.2" | "11.0")
+    conda install -y -c pytorch "pytorch>=1.4"
+    ;;
+*)
+    echo "Unsupported CUDA version for pytorch."
+    echo "Not installing pytorch."
+    ;;
+esac
+
+
 env
 /test.sh 2>&1 | tee nbtest.log
 EXITCODE=$?
 python /rapids/utils/nbtestlog2junitxml.py nbtest.log
 
-exit ${EXITCODE}
+exit ${EXITCODE}

conda/recipes/rapids-build-env/meta.yaml

@@ -48,6 +48,7 @@ requirements:
     - conda-forge::clang {{ clang_version }}
     - conda-forge::clang-tools {{ clang_version }}
     - cmake {{ cmake_version }}
+    - cmake-format {{ cmake_format_version }}
     - cmake_setuptools {{ cmake_setuptools_version }}
     - conda {{ conda_version }}
     - conda-build {{ conda_build_version }}
@@ -98,6 +99,7 @@ requirements:
     - nltk
     - numba {{ numba_version }}
     - numpy {{ numpy_version }}
+    - nvtx {{ nvtx_version }}
     - pandas {{ pandas_version }}
     - panel {{ panel_version }}
     - pickle5  # [py<38]
@@ -110,7 +112,7 @@ requirements:
     - pyppeteer
     - pyproj {{ pyproj_version }}
     - pytest
-    - pytest-asyncio
+    - pytest-asyncio {{ pytest_asyncio_version }}
     - pytest-benchmark
     - pytest-cov
     - pytest-timeout

conda/recipes/rapids-notebook-env/meta.yaml

@@ -42,11 +42,13 @@ requirements:
     - cython {{ cython_version }}
     - dask-labextension
     - dask-ml
+    - fa2
+    - filterpy
     - holoviews
     - ipython {{ ipython_version }}
     - jupyter-server-proxy
     - jupyterlab {{ jupyterlab_version }}
-    - matplotlib
+    - matplotlib-base
     - networkx {{ networkx_version }}
     - nodejs {{ nodejs_version }}
     - pytest

conda/recipes/rapids-xgboost/meta.yaml

@@ -5,14 +5,14 @@
 {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %}
 {% set py_version = environ.get('CONDA_PY', 36) %}
 
-### 
+###
 # Versions referenced below are set in `conda/recipe/*versions.yaml` except for
 #   those set above (e.g. `cuda_version`)
 #
-# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in 
+# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in
 #   `ci/cpu/build-meta.sh` and `ci/axis/*.yaml`
 #
-# Manual builds need to use the `conda build` flag of `-m <path-to-file>.yaml` 
+# Manual builds need to use the `conda build` flag of `-m <path-to-file>.yaml`
 #   to set these versions
 ###
 
@@ -38,7 +38,7 @@ requirements:
     - cudatoolkit ={{ cuda_version }}.*
     - nccl {{ nccl_version }}
     - python
-    - xgboost {{ xgboost_version }}{{ minor_version }}
+    - xgboost {{ xgboost_version }}
 
 about:
   home: http://rapids.ai/

conda/recipes/rapids/meta.yaml

@@ -41,8 +41,10 @@ requirements:
     - networkx {{ networkx_version }}
     - numba {{ numba_version }}
     - numpy {{ numpy_version }}
+    - nvtx {{ nvtx_version }}
     - pickle5  # [py<38]
     - python
+    - setuptools {{ setuptools_version }}
     - cudf ={{ minor_version }}.*
     - cugraph ={{ minor_version }}.*
     - cuml ={{ minor_version }}.*
@@ -51,7 +53,6 @@ requirements:
     - custreamz ={{ minor_version }}.*
     - cuxfilter ={{ minor_version }}.*
     - dask-cuda ={{ minor_version }}.*
-    - dask-xgboost {{ dask_xgboost_version }}
     - rapids-xgboost ={{ minor_version }}.*
     - rmm ={{ minor_version }}.*
 

conda/recipes/versions.yaml

@@ -8,13 +8,13 @@ dask_xgboost_version:
 
 # Versions for `rapids-xgboost` meta-pkg
 xgboost_version:
-  - '=1.2.0dev.rapidsai'
+  - '=1.2.0dev.rapidsai0.17'
 
 # Versions for conda
 conda_version:
-  - '=4.7.12'
+  - '=4.8.3'
 conda_build_version:
-  - '=3.18.11'
+  - '=3.20.3'
 conda_verify_version:
   - '=3.1.1'
 
@@ -37,10 +37,12 @@ clang_version:
   - '=8.0.1'
 cmake_version:
   - '=3.18'
+cmake_format_version:
+  - '=0.6.11'
 cmake_setuptools_version:
   - '>=0.1.3'
 cupy_version:
-  - '>=7.1.0,<8.0.0a0'
+  - '>7.1.0,<9.0.0a0'
 cython_version:
   - '>=0.29.17,<0.30'
 dask_version:
@@ -50,13 +52,13 @@ datashader_version:
 distributed_version:
   - '>=2.23.0'
 dlpack_version:
-  - '=0.2'
+  - '>=0.3,<0.4.0a0'
 double_conversion_version:
   - '=3.1.5'
 doxygen_version:
   - '>=1.8.12,<=1.8.20'
 faiss_version:
-  - '>=1.6.3'
+  - '=1.6.3'
 fastavro_version:
   - '>=0.22.0'
 flake8_version:
@@ -84,7 +86,7 @@ librdkafka_version:
 mypy_version:
   - '0.782'
 nccl_version:
-  - '>=2.7.6.1,<2.8'
+  - '>=2.7.8.1,<3.0a0'
 networkx_version:
   - '>=2.3'
 nodejs_version:
@@ -93,6 +95,8 @@ numba_version:
   - '>=0.51.2'
 numpy_version:
   - '>=1.17.3'
+nvtx_version:
+  - '>=0.2.1,<0.3'
 pandas_version:
   - '>=1.0,<1.2.0dev0'
 pandoc_version:
@@ -107,15 +111,19 @@ protobuf_version:
   - '>=3.4.1,<4.0.0'
 pyproj_version:
   - '>=2.4'
+pytest_asyncio_version:
+  - '<0.14.0'
 rapidjson_version:
   - '=1.1.0'
 scikit_learn_version:
   - '=0.23.1'
 scipy_version:
   - '=1.5.1'
+setuptools_version:
+  - '>=49,<50'
 spdlog_version:
   - '=1.7.0'
 sphinx_markdown_tables_version:
   - '=0.0.14=pyh9f0ad1d_1'
 treelite_version:
-  - '=0.92'
+  - '=0.93'