diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-env-arm64.yaml similarity index 87% rename from ci/axis/nightly-arm64.yaml rename to ci/axis/nightly-env-arm64.yaml index 7539cf0e..0dfae40c 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/ci/axis/nightly-env-arm64.yaml @@ -6,16 +6,14 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 21.12.00a + - 22.02.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly-env.yaml similarity index 85% rename from ci/axis/nightly.yaml rename to ci/axis/nightly-env.yaml index eb8daccf..0dfae40c 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly-env.yaml @@ -6,17 +6,14 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 21.12.00a + - 22.02.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 - - 11.0 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/nightly-meta-arm64.yaml b/ci/axis/nightly-meta-arm64.yaml new file mode 100644 index 00000000..0dfae40c --- /dev/null +++ b/ci/axis/nightly-meta-arm64.yaml @@ -0,0 +1,19 @@ +CONDA_USERNAME: + - rapidsai-nightly + +CONDA_CONFIG_FILE: + - conda/recipes/versions.yaml + +# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag +RAPIDS_VER: + - 22.02.00a + +# Use CUDA_VER to not clobber `CUDA_VERSION` in the container +CUDA_VER: + - 11.5 + +PYTHON_VER: + - 3.8 + - 3.9 + +exclude: diff --git a/ci/axis/nightly-meta.yaml b/ci/axis/nightly-meta.yaml new file mode 100644 index 00000000..0dfae40c --- /dev/null +++ b/ci/axis/nightly-meta.yaml @@ -0,0 +1,19 @@ +CONDA_USERNAME: + - rapidsai-nightly + +CONDA_CONFIG_FILE: + - conda/recipes/versions.yaml + +# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag +RAPIDS_VER: + - 22.02.00a + +# Use CUDA_VER to not clobber `CUDA_VERSION` in the container +CUDA_VER: + - 11.5 + +PYTHON_VER: + - 3.8 + - 3.9 + +exclude: diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 11290c47..7ef29118 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -6,16 +6,14 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - "21.12.00" + - "22.02.00" # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index a7eb192d..7ef29118 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -6,17 +6,14 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - "21.12.00" + - "22.02.00" # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 - - 11.0 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index d44fe810..92e31f2b 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -6,13 +6,10 @@ DOCKER_REPO: # Use M.X (major.minor) version RAPIDS_VER: - - "21.12" + - "22.02" CUDA_VER: - 11.5 - - 11.4 - - 11.2 - - 11.0 LINUX_VER: - ubuntu18.04 @@ -21,6 +18,6 @@ LINUX_VER: - centos8 PYTHON_VER: - - 3.7 + - 3.8 exclude: diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 9d1068de..59075d66 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -4,6 +4,7 @@ {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} +{% set cuda_major=cuda_version.split('.')[0] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -25,7 +26,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER @@ -55,7 +56,8 @@ requirements: - conda {{ conda_version }} - conda-build {{ conda_build_version }} - conda-verify {{ conda_verify_version }} - - cudatoolkit ={{ cuda_version }}.* + - cuda-python {{ cuda_python_version }} + - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - cython {{ cython_version }} - dask {{ dask_version }} @@ -78,6 +80,7 @@ requirements: - graphviz - gtest {{ gtest_version }} - hdbscan + - holoviews {{ holoviews_version }} - httpretty - hypothesis - isort {{ isort_version }} @@ -113,6 +116,7 @@ requirements: - pre-commit - protobuf {{ protobuf_version }} - psutil + - ptxcompiler # [linux64] # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler - pyarrow {{ arrow_version }} - pydeck {{ pydeck_version }} - pydocstyle {{ pydocstyle_version }} diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index a6051f75..5451c143 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -35,6 +35,7 @@ requirements: - pip run: - beautifulsoup4 + - breathe - doxygen {{ doxygen_version }} - html5lib - jupyter_sphinx diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 9c01bd1d..cabcd394 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -4,6 +4,7 @@ {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} +{% set cuda_major=cuda_version.split('.')[0] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -25,7 +26,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER @@ -38,13 +39,12 @@ requirements: - bokeh {{ bokeh_version }} - colorcet - conda-forge::blas - - cudatoolkit ={{ cuda_version }}.* + - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - cython {{ cython_version }} - dask-labextension - dask-ml - datashader {{ datashader_version }} - - fa2 - filterpy - holoviews - ipython {{ ipython_version }} @@ -52,7 +52,6 @@ requirements: - jupyter-server-proxy - jupyterlab {{ jupyterlab_version }} - jupyterlab-favorites - - jupyterlab-nvdashboard - jupyter-packaging {{ jupyter_packaging_version }} - jupyterlab_widgets - matplotlib-base diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 613e2059..ab7aba01 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -4,6 +4,7 @@ {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} +{% set cuda_major=cuda_version.split('.')[0] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -25,7 +26,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER @@ -35,7 +36,7 @@ requirements: host: - python run: - - cudatoolkit ={{ cuda_version }}.* + - cudatoolkit ={{ cuda_major }}.* - nccl {{ nccl_version }} - python - xgboost {{ xgboost_version }}{{ minor_version }} diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index fe2c439c..5cb3da0b 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -4,6 +4,7 @@ {% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} +{% set cuda_major=cuda_version.split('.')[0] %} ### # Versions referenced below are set in `conda/recipe/*versions.yaml` except for @@ -25,7 +26,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CUDA_VERSION - RAPIDS_VER @@ -35,7 +36,8 @@ requirements: host: - python run: - - cudatoolkit ={{ cuda_version }}.* + - cuda-python {{ cuda_python_version }} + - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - nccl {{ nccl_version }} - networkx {{ networkx_version }} @@ -56,15 +58,25 @@ requirements: - dask-cuda ={{ minor_version }}.* - rapids-xgboost ={{ minor_version }}.* - rmm ={{ minor_version }}.* + - pylibcugraph ={{ minor_version }}.* + - libcugraph_etl ={{ minor_version }}.* - ptxcompiler # [linux64] # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler -test: # [linux64] - imports: # [linux64] - - cudf # [linux64] - - dask_cudf # [linux64] - - cuml # [lunux64] - - cugraph # [linux64] - - cuspatial # [linux64] +test: # [linux64] + imports: # [linux64] + - cucim # [linux64] + - cudf # [linux64] + - cudf_kafka # [linux64] + - cugraph # [linux64] + - cuml # [lunux64] + - cusignal # [linux64] + - cuspatial # [linux64] + - custreamz # [linux64] + - cuxfilter # [linux64] + - dask_cuda # [linux64] + - dask_cudf # [linux64] + - pylibcugraph # [linux64] + - rmm # [linux64] about: home: http://rapids.ai/ diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 4c8cbe1c..75013056 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -15,7 +15,7 @@ xgboost_version: conda_version: - '=4.10.3' conda_build_version: - - '=3.20.3' + - '=3.21.7' conda_verify_version: - '=3.1.1' @@ -42,16 +42,18 @@ cmake_format_version: - '=0.6.11' cmake_setuptools_version: - '>=0.1.3' +cuda_python_version: + - '>=11.5,<12' cupy_version: - - '>=9.5.0,<10.0.0a0' + - '>=9.5.0,<11.0.0a0' cython_version: - '>=0.29.17,<0.30' dask_version: - - '>=2021.11.1,<=2021.11.2' + - '>=2021.11.1,<=2022.01.0' datashader_version: - - '>=0.11.1,<0.12' + - '>0.12,<=0.13' distributed_version: - - '>=2021.11.1,<=2021.11.2' + - '>=2021.11.1,<=2022.01.0' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: @@ -78,8 +80,10 @@ gmock_version: - '=1.10.0' gtest_version: - '=1.10.0' +holoviews_version: + - '>1.14.1,<=1.14.6' ipython_version: - - '=7.15' + - '=7.31.0' isort_version: - '=5.6.4' jupyterlab_version: @@ -87,7 +91,7 @@ jupyterlab_version: jupyter_packaging_version: - '>=0.7.0,<0.8' librdkafka_version: - - '=1.6.*' + - '=1.7.*' mimesis_version: - '<4.1' moto_version: @@ -107,9 +111,9 @@ nlohmann_json_version: nodejs_version: - '>=12,<15' numba_version: - - '>=0.53.1' + - '>=0.54' numpy_version: - - '>=1.17.3' + - '>=1.19' nvtx_version: - '>=0.2.1,<0.3' openjdk_version: @@ -143,7 +147,7 @@ rapidjson_version: s3fs_version: - '>=2021.08.0' scikit_image_version: - - '>=0.18.0,<0.19.0' + - '>=0.18.0,<0.20.0' scikit_learn_version: - '=0.24' scipy_version: @@ -155,6 +159,6 @@ spdlog_version: sphinx_markdown_tables_version: - '=0.0.14=pyh9f0ad1d_1' treelite_version: - - '=2.1.0' + - '=2.2.1' transformers_version: - '<=4.10.3'