diff --git a/ci/axis/nightly-env-arm64.yaml b/ci/axis/nightly-env-arm64.yaml index 650b89dc..b0996feb 100644 --- a/ci/axis/nightly-env-arm64.yaml +++ b/ci/axis/nightly-env-arm64.yaml @@ -11,11 +11,10 @@ RAPIDS_VER: # 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-env.yaml b/ci/axis/nightly-env.yaml index 2caefd22..b0996feb 100644 --- a/ci/axis/nightly-env.yaml +++ b/ci/axis/nightly-env.yaml @@ -11,12 +11,10 @@ RAPIDS_VER: # 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 index 650b89dc..f149d9df 100644 --- a/ci/axis/nightly-meta-arm64.yaml +++ b/ci/axis/nightly-meta-arm64.yaml @@ -11,8 +11,6 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 PYTHON_VER: - 3.7 diff --git a/ci/axis/nightly-meta.yaml b/ci/axis/nightly-meta.yaml index 2caefd22..f149d9df 100644 --- a/ci/axis/nightly-meta.yaml +++ b/ci/axis/nightly-meta.yaml @@ -11,9 +11,6 @@ RAPIDS_VER: # 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 diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 3363a2f6..26bbf7f8 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -11,8 +11,6 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 11.5 - - 11.4 - - 11.2 PYTHON_VER: - 3.7 diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index b070bae2..26bbf7f8 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -11,9 +11,6 @@ RAPIDS_VER: # 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 diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index de6daec3..6b5600eb 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -10,9 +10,6 @@ RAPIDS_VER: CUDA_VER: - 11.5 - - 11.4 - - 11.2 - - 11.0 LINUX_VER: - ubuntu18.04 @@ -22,5 +19,6 @@ LINUX_VER: 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 8a6f9ea3..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 @@ -56,7 +57,7 @@ requirements: - conda-build {{ conda_build_version }} - conda-verify {{ conda_verify_version }} - cuda-python {{ cuda_python_version }} - - cudatoolkit ={{ cuda_version }}.* + - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - cython {{ cython_version }} - dask {{ dask_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 5818d376..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 }} 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 13aaace3..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 @@ -36,7 +37,7 @@ requirements: - python run: - cuda-python {{ cuda_python_version }} - - cudatoolkit ={{ cuda_version }}.* + - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - nccl {{ nccl_version }} - networkx {{ networkx_version }} diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 0a0498c6..54b98b2f 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' @@ -45,7 +45,7 @@ cmake_setuptools_version: 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: @@ -83,7 +83,7 @@ gtest_version: holoviews_version: - '>1.14.1,<=1.14.6' ipython_version: - - '=7.15' + - '=7.31.0' isort_version: - '=5.6.4' jupyterlab_version: @@ -147,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: