diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 1776f183..76ad9700 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -6,11 +6,12 @@ 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 + - 0.20.0a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.2 - 11.0 - 10.2 - 10.1 @@ -22,3 +23,9 @@ DEFAULT_CUDA_VER: PYTHON_VER: - 3.7 - 3.8 + +exclude: + - RAPIDS_VER: 0.20.0a + CUDA_VER: 10.1 + - RAPIDS_VER: 0.20.0a + CUDA_VER: 10.2 diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 1e3f3dc2..54cbc2f5 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -6,10 +6,11 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - 0.18.0 + - 0.19.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.2 - 11.0 - 10.2 - 10.1 diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index f1b6e970..fff843da 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -2,11 +2,10 @@ RUNTIME_DOCKER_REPO: - rapidsai/rapidsai-nightly DOCKER_REPO: - - rapidsai/rapidsai-dev-nightly + - rapidsai/rapidsai-core-dev-nightly # Use M.X (major.minor) version RAPIDS_VER: - - 0.18 - 0.19 CUDA_VER: diff --git a/ci/test/notebooks.sh b/ci/test/notebooks.sh index ceb987de..7cd72af0 100644 --- a/ci/test/notebooks.sh +++ b/ci/test/notebooks.sh @@ -11,7 +11,7 @@ source /opt/conda/bin/activate rapids # 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" + conda install -y -c pytorch "pytorch=1.7" ;; *) echo "Unsupported CUDA version for pytorch." diff --git a/conda/recipes/blazingsql-build-env/meta.yaml b/conda/recipes/blazingsql-build-env/meta.yaml index 88b6c210..08a6ae96 100644 --- a/conda/recipes/blazingsql-build-env/meta.yaml +++ b/conda/recipes/blazingsql-build-env/meta.yaml @@ -42,7 +42,9 @@ requirements: - gtest {{ gtest_version }} - jpype1 - maven + - mysql-connector-cpp {{ mysql_connector_cpp_version }} - netifaces + - nlohmann_json {{ nlohmann_json_version }} - ninja - openjdk {{ openjdk_version }} - pyhive diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index b6d82c69..67e8707c 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/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-env.sh` and `ci/axis/*.yaml` # -# Manual builds need to use the `conda build` flag of `-m .yaml` +# Manual builds need to use the `conda build` flag of `-m .yaml` # to set these versions ### @@ -46,6 +46,7 @@ requirements: - boost - boost-cpp {{ boost_cpp_version }} - boto3 + - cachetools - conda-forge::clang {{ clang_version }} - conda-forge::clang-tools {{ clang_version }} - cmake {{ cmake_version }} @@ -70,7 +71,7 @@ requirements: - flake8 {{ flake8_version }} - flatbuffers {{ flatbuffers_version }} - fsspec {{ fsspec_version }} - - gcsfs + - gcsfs {{ gcsfs_version }} - gdal {{ gdal_version }} - geopandas {{ geopandas_version }} - git @@ -102,6 +103,7 @@ requirements: - numba {{ numba_version }} - numpy {{ numpy_version }} - nvtx {{ nvtx_version }} + - packaging - pandas {{ pandas_version }} - panel {{ panel_version }} - pickle5 # [py<38] @@ -124,16 +126,17 @@ requirements: - python-confluent-kafka {{ python_confluent_kafka_version }} - python-louvain - rapidjson {{ rapidjson_version }} - - rapids-pytest-benchmark - ripgrep - s3fs {{ s3fs_version }} - setuptools + - scikit-image {{ scikit_image_version }} - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} - shellcheck - spdlog {{ spdlog_version }} - statsmodels - streamz + - transformers - treelite {{ treelite_version }} - twine - typing_extensions diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 8e5babca..9949a76a 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -55,6 +55,7 @@ requirements: - nodejs {{ nodejs_version }} - pytest - s3fs {{ s3fs_version }} + - scikit-image {{ scikit_image_version }} - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} - seaborn diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 3e600fd3..24b5b3a4 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.3dev.rapidsai' + - '=1.4.0dev.rapidsai' # Versions for conda conda_version: @@ -43,15 +43,15 @@ cmake_format_version: cmake_setuptools_version: - '>=0.1.3' cupy_version: - - '>=7.8.0,<9.0.0a0' + - '>=8.5.0,<9.0.0a0' cython_version: - '>=0.29.17,<0.30' dask_version: - - '>=2.23.0' + - '=2021.4.0' datashader_version: - '>=0.11.1,<0.12' distributed_version: - - '>=2.23.0' + - '>=2.23.0,<=2021.4.0' dlpack_version: - '>=0.3,<0.4.0a0' double_conversion_version: @@ -59,7 +59,7 @@ double_conversion_version: doxygen_version: - '>=1.8.12,<=1.8.20' faiss_version: - - '=1.6.3' + - '=1.7.0' fastavro_version: - '>=0.22.0' flake8_version: @@ -67,13 +67,15 @@ flake8_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.6.0' + - '>=0.9.0' gdal_version: - - '>=3.1.0,<3.2.0a0' + - '>=3.2.0,<3.3.0a0' geopandas_version: - '>=0.6, <=0.8.1' +gcsfs_version: + - '>=0.8.0' google_cloud_cpp_version: - - '=1.16.0' + - '=1.25.0' gmock_version: - '=1.10.0' gtest_version: @@ -90,10 +92,14 @@ moto_version: - '>=1.3.14' mypy_version: - '0.782' +mysql_connector_cpp_version: + - '8.0.23' nccl_version: - - '>=2.7.8.1,<3.0a0' + - '>=2.8.4.1,<3.0a0' networkx_version: - - '>=2.3' + - '>=2.5.1' +nlohmann_json_version: + - '3.9.1' nodejs_version: - '>=12,<15' numba_version: @@ -105,7 +111,7 @@ nvtx_version: openjdk_version: - '>=8.0' pandas_version: - - '>=1.0,<1.2.0dev0' + - '>=1.0,<1.3.0dev0' pandoc_version: - '<=2.0.0' panel_version: @@ -128,10 +134,12 @@ rapidjson_version: - '=1.1.0' s3fs_version: - '>=0.5.2' +scikit_image_version: + - '>=0.18.0,<0.19.0' scikit_learn_version: - '=0.23.1' scipy_version: - - '=1.5.3' + - '=1.6.0' setuptools_version: - '>=49,<50' spdlog_version: @@ -139,4 +147,4 @@ spdlog_version: sphinx_markdown_tables_version: - '=0.0.14=pyh9f0ad1d_1' treelite_version: - - '=1.0.0' + - '=1.1.0'