Skip to content

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci] #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GPUtester merged 29 commits into from
Jan 19, 2022
Merged

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci] #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
92c85cb
updated yaml files to remove 3.7 and include 3.9
msadang Nov 29, 2021
e392f84
Update ci/axis/tests.yaml
msadang Nov 30, 2021
cd7946a
change python version order
msadang Dec 6, 2021
845b894
Merge branch 'python39-support' of https://github.com/msadang/integra…
msadang Dec 6, 2021
d35a376
Merge branch 'branch-22.02' into python39-support
msadang Dec 6, 2021
1aca45e
Merge branch 'branch-22.02' into python39-support
msadang Dec 7, 2021
a34026f
Merge branch 'branch-22.02' into python39-support
raydouglass Jan 4, 2022
d536394
Update conda build version
msadang Jan 5, 2022
e07afb5
Merge branch 'branch-22.02' into python39-support
raydouglass Jan 7, 2022
adfcd82
remove fa2 package
msadang Jan 10, 2022
1ed8fcd
add python 3.0 to tests
msadang Jan 10, 2022
c1fbcf2
update ipython to py39 compatible version
msadang Jan 11, 2022
2eb8817
Fix upstream conflicts
msadang Jan 11, 2022
cc7589d
Merge pull request #1 from rapidsai/branch-22.02
msadang Jan 11, 2022
d6eda82
add py39 to nightly yaml
msadang Jan 11, 2022
903e277
make cuda toolkit version equivalent to 11.x
AyodeAwe Jan 13, 2022
2955b16
make integration packages 11.5 only (CEC)
AyodeAwe Jan 13, 2022
760cbac
Merge branch 'branch-22.02' into ops-1933
ajschmidt8 Jan 13, 2022
cd6e167
Merge pull request #411 from AyodeAwe/ops-1933
AyodeAwe Jan 13, 2022
36af876
Allow CuPy 10
jakirkham Jan 14, 2022
8639316
Merge pull request #413 from jakirkham/allow_cupy_10
jjacobelli Jan 14, 2022
9d932ff
Merge branch 'branch-22.02' into python39-support
jjacobelli Jan 17, 2022
c982824
allow scikit-image 0.19 in the conda environment
grlee77 Jan 17, 2022
4ffa1e1
Update axis files for python 3.9
jjacobelli Jan 18, 2022
3986715
Merge pull request #400 from msadang/python39-support
jjacobelli Jan 18, 2022
ac58024
Merge branch 'branch-22.02' into allow-skimage-0_19
ajschmidt8 Jan 18, 2022
9b5e16f
Adding breathe to rapids-doc-env
cjnolet Jan 18, 2022
b789b20
Merge pull request #415 from cjnolet/imp-2202-add_breathe_package
ajschmidt8 Jan 19, 2022
a76cfc3
Merge pull request #414 from grlee77/allow-skimage-0_19
ajschmidt8 Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ci/axis/nightly-env-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
4 changes: 1 addition & 3 deletions ci/axis/nightly-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
2 changes: 0 additions & 2 deletions ci/axis/nightly-meta-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/axis/nightly-meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/axis/release-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/axis/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions ci/axis/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ RAPIDS_VER:

CUDA_VER:
- 11.5
- 11.4
- 11.2
- 11.0

LINUX_VER:
- ubuntu18.04
Expand All @@ -22,5 +19,6 @@ LINUX_VER:

PYTHON_VER:
- 3.7
- 3.8

exclude:
5 changes: 3 additions & 2 deletions conda/recipes/rapids-build-env/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/rapids-doc-env/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ requirements:
- pip
run:
- beautifulsoup4
- breathe
- doxygen {{ doxygen_version }}
- html5lib
- jupyter_sphinx
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/rapids-notebook-env/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/rapids-xgboost/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -35,7 +36,7 @@ requirements:
host:
- python
run:
- cudatoolkit ={{ cuda_version }}.*
- cudatoolkit ={{ cuda_major }}.*
- nccl {{ nccl_version }}
- python
- xgboost {{ xgboost_version }}{{ minor_version }}
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/rapids/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down