Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9944d40
Bump librdkafka version to 1.7.*
jdye64 Oct 27, 2021
39808bb
Merge branch 'branch-21.12' into librdkafka_1.7
ajschmidt8 Nov 2, 2021
1483bcc
Merge branch 'branch-21.12' into librdkafka_1.7
ajschmidt8 Nov 3, 2021
3eb77f8
DOC v22.02 Updates
ajschmidt8 Nov 4, 2021
e9db79d
Merge pull request #392 from rapidsai/branch-21.12
GPUtester Nov 17, 2021
8d9736f
Merge pull request #393 from rapidsai/branch-21.12
GPUtester Nov 18, 2021
509fb69
Merge pull request #394 from rapidsai/branch-21.12
GPUtester Nov 18, 2021
2d56be6
Merge pull request #397 from rapidsai/branch-21.12
GPUtester Nov 22, 2021
cc286ca
Merge pull request #399 from rapidsai/branch-21.12
GPUtester Nov 29, 2021
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
a2ecb0e
Add CUDA Python
shwina Dec 3, 2021
d24d654
Update conda/recipes/rapids-build-env/meta.yaml
shwina Dec 6, 2021
df14246
Update conda/recipes/rapids/meta.yaml
shwina Dec 6, 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
3b4eaa6
Merge pull request #401 from shwina/add-cudapython
ajschmidt8 Dec 6, 2021
1aca45e
Merge branch 'branch-22.02' into python39-support
msadang Dec 7, 2021
1b00e01
Merge branch 'branch-22.02' into librdkafka_1.7
ajschmidt8 Dec 13, 2021
d503c20
Merge pull request #386 from jdye64/librdkafka_1.7
ajschmidt8 Dec 13, 2021
11f5b86
Add missing imports tests
jjacobelli Dec 16, 2021
b5097dd
Add pylibcugraph and libcugraph_etl to rapids meta package
jjacobelli Dec 16, 2021
b105409
Add `ptxcompiler` to `rapids-build-env`
ajschmidt8 Dec 17, 2021
064dc2b
Merge pull request #403 from ajschmidt8/add-ptxcompiler
ajschmidt8 Dec 17, 2021
433224b
Fix cuda-python version spec
raydouglass Dec 20, 2021
ae421a4
Merge pull request #404 from raydouglass/fix-cuda-python-spec
raydouglass Dec 20, 2021
ca87cfb
Merge branch 'branch-22.02' into imports-tests
jjacobelli Dec 20, 2021
ef7dcec
Merge pull request #402 from Ethyling/imports-tests
jjacobelli Dec 20, 2021
2a6b979
FIx cuda-python version spec
raydouglass Dec 21, 2021
a34026f
Merge branch 'branch-22.02' into python39-support
raydouglass Jan 4, 2022
d536394
Update conda build version
msadang Jan 5, 2022
d515f76
remove-jupyterlab-nvdashboard
msadang Jan 6, 2022
039fe27
Merge branch 'branch-22.02' into remove-rapids-notebook
ajschmidt8 Jan 7, 2022
f0848c2
Merge pull request #405 from msadang/remove-rapids-notebook
raydouglass Jan 7, 2022
e07afb5
Merge branch 'branch-22.02' into python39-support
raydouglass Jan 7, 2022
26b4cda
Split axis files for env and meta packages
jjacobelli Jan 10, 2022
adfcd82
remove fa2 package
msadang Jan 10, 2022
1ed8fcd
add python 3.0 to tests
msadang Jan 10, 2022
490549a
add holoviews dependency and update datashader version
AjayThorve Jan 10, 2022
45cc065
Merge pull request #406 from Ethyling/split-axis
jjacobelli Jan 11, 2022
a3bb45e
Merge release axis files
jjacobelli Jan 11, 2022
365c37f
Merge pull request #408 from Ethyling/split-axis
jjacobelli Jan 11, 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
1cb4992
update numba to 0.54
AjayThorve Jan 11, 2022
bca9516
Merge branch 'branch-22.02' into update/cuxfilter-dependencies
ajschmidt8 Jan 11, 2022
328f26e
Merge pull request #407 from AjayThorve/update/cuxfilter-dependencies
ajschmidt8 Jan 12, 2022
43eebd1
unpin dask and distributed versions
galipremsagar Jan 12, 2022
abc4591
Merge pull request #409 from galipremsagar/patch-30
ajschmidt8 Jan 13, 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
b867ca6
Upgrade to Treelite 2.2.0
chyunsu3 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
3a359de
Use 2.2.1 patch release
chyunsu3 Jan 15, 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
810ccfa
Merge branch 'branch-22.02' into upgrade_treelite
ajschmidt8 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
d89c3ae
Merge branch 'branch-22.02' into upgrade_treelite
ajschmidt8 Jan 19, 2022
4651583
Bump Numpy version to 1.19 for Python 3.9
jjacobelli Jan 20, 2022
17c3787
pin dask & distributed versions
galipremsagar Jan 23, 2022
245cf58
Merge pull request #418 from galipremsagar/patch-32
ajschmidt8 Jan 24, 2022
3062860
Merge branch 'branch-22.02' into upgrade_treelite
ajschmidt8 Jan 24, 2022
f1d1058
Merge branch 'branch-22.02' into bump-numpy
ajschmidt8 Jan 24, 2022
f58efe9
Merge pull request #412 from hcho3/upgrade_treelite
ajschmidt8 Jan 24, 2022
237b372
Merge branch 'branch-22.02' into bump-numpy
jjacobelli Jan 24, 2022
fcffab8
Merge pull request #417 from Ethyling/bump-numpy
jjacobelli Jan 26, 2022
11df670
Remove Python 3.7 and add Python 3.9
jjacobelli Jan 28, 2022
f5dbae5
Merge pull request #422 from Ethyling/python39
jjacobelli Jan 28, 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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
7 changes: 2 additions & 5 deletions ci/axis/nightly.yaml → ci/axis/nightly-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
19 changes: 19 additions & 0 deletions ci/axis/nightly-meta-arm64.yaml
Original file line number Diff line number Diff line change
@@ -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:
19 changes: 19 additions & 0 deletions ci/axis/nightly-meta.yaml
Original file line number Diff line number Diff line change
@@ -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:
6 changes: 2 additions & 4 deletions ci/axis/release-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
7 changes: 2 additions & 5 deletions ci/axis/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
7 changes: 2 additions & 5 deletions ci/axis/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,6 +18,6 @@ LINUX_VER:
- centos8

PYTHON_VER:
- 3.7
- 3.8

exclude:
8 changes: 6 additions & 2 deletions conda/recipes/rapids-build-env/meta.yaml
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 @@ -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 }}
Expand All @@ -78,6 +80,7 @@ requirements:
- graphviz
- gtest {{ gtest_version }}
- hdbscan
- holoviews {{ holoviews_version }}
- httpretty
- hypothesis
- isort {{ isort_version }}
Expand Down Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/rapids-doc-env/meta.yaml
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
7 changes: 3 additions & 4 deletions conda/recipes/rapids-notebook-env/meta.yaml
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,21 +39,19 @@ 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 }}
- ipywidgets
- jupyter-server-proxy
- jupyterlab {{ jupyterlab_version }}
- jupyterlab-favorites
- jupyterlab-nvdashboard
- jupyter-packaging {{ jupyter_packaging_version }}
- jupyterlab_widgets
- matplotlib-base
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/rapids-xgboost/meta.yaml
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
30 changes: 21 additions & 9 deletions conda/recipes/rapids/meta.yaml
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,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 }}
Expand All @@ -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/
Expand Down
26 changes: 15 additions & 11 deletions conda/recipes/versions.yaml
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 All @@ -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:
Expand All @@ -78,16 +80,18 @@ 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:
- '>=3.0.0,<4.0a0'
jupyter_packaging_version:
- '>=0.7.0,<0.8'
librdkafka_version:
- '=1.6.*'
- '=1.7.*'
mimesis_version:
- '<4.1'
moto_version:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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'