Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
c35e3ee
Require scikit-image 0.18.0+
jakirkham Jan 15, 2021
c72f707
Pin gdal to 3.2.x
weiji14 Feb 3, 2021
a53e31f
Update FAISS to 1.7.0
viclafargue Feb 18, 2021
a9e9357
add cachetools
ajschmidt8 Feb 23, 2021
8846b25
ENH Update versions to 0.19
raydouglass Feb 25, 2021
9a3015c
Merge pull request #222 from raydouglass/0.19-updates
raydouglass Feb 25, 2021
5027a5a
Bump up pandas version to 1.2.2
galipremsagar Feb 26, 2021
bfdaffe
Merge pull request #223 from galipremsagar/patch-9
dillon-cullinan Feb 26, 2021
58c5d18
Merge pull request #220 from ajschmidt8/add-deps
ajschmidt8 Feb 26, 2021
824c9fb
Merge pull request #224 from rapidsai/branch-0.18
ajschmidt8 Feb 26, 2021
e590887
add packaging
ajschmidt8 Feb 26, 2021
a396206
Merge pull request #225 from ajschmidt8/add-deps
ajschmidt8 Mar 1, 2021
4c19079
Merge branch 'branch-0.19' into req_skimage_18
mike-wendt Mar 4, 2021
9d424d9
Merge branch 'branch-0.19' into update-faiss
raydouglass Mar 4, 2021
ba58fc0
Merge branch 'branch-0.19' into patch-1
raydouglass Mar 4, 2021
b113edc
Merge pull request #206 from jakirkham/req_skimage_18
raydouglass Mar 4, 2021
1289e02
Merge branch 'branch-0.19' into patch-1
raydouglass Mar 4, 2021
4de4c73
Merge branch 'branch-0.19' into update-faiss
mike-wendt Mar 4, 2021
084b67f
Merge pull request #219 from viclafargue/update-faiss
mike-wendt Mar 4, 2021
14d1ef1
Merge branch 'branch-0.19' into patch-1
mike-wendt Mar 4, 2021
f9ac490
Merge pull request #211 from weiji14/patch-1
ajschmidt8 Mar 5, 2021
c9c5832
Update nccl to 2.8.4.1
raydouglass Mar 9, 2021
cd2b094
Merge pull request #229 from rapidsai/nccl-2.8.4.1
raydouglass Mar 9, 2021
614aa10
bump cupy version to >=8.5.0
kkraus14 Mar 17, 2021
07b663a
Merge pull request #230 from kkraus14/cupy_8_5_0
mike-wendt Mar 17, 2021
0b67003
Update minimum scipy version to 1.6
awthomp Mar 18, 2021
a959c50
Merge pull request #231 from awthomp/scipy_update
ajschmidt8 Mar 18, 2021
35b854c
ENH Add CUDA 11.2 support
mike-wendt Mar 19, 2021
faee43d
Merge pull request #232 from mike-wendt/enh-cuda112
mike-wendt Mar 19, 2021
de114f6
update pytorch version
ajschmidt8 Mar 23, 2021
1ea6965
Merge pull request #233 from ajschmidt8/pytorch-version
ajschmidt8 Mar 23, 2021
7dfa037
Update nightly.yaml
raydouglass Mar 29, 2021
bab6c26
bump dask to 2021.3.1
brandon-b-miller Mar 30, 2021
358e19c
Merge pull request #235 from brandon-b-miller/dask-2021-3-1
mike-wendt Mar 30, 2021
687a5a9
Merge branch 'branch-0.19' into v0.20
raydouglass Mar 31, 2021
27c8bec
Merge pull request #234 from rapidsai/v0.20
mike-wendt Mar 31, 2021
a52fa2f
Update to XGBoost 1.4.0rc1
chyunsu3 Apr 2, 2021
268a229
Merge pull request #236 from hcho3/new_xgboost
raydouglass Apr 2, 2021
683caad
FIX Update Google Cloud cpp version
dillon-cullinan Apr 2, 2021
88d1f3d
TST Temporarily use core images for nightly testing
dillon-cullinan Apr 2, 2021
1d9be03
Merge pull request #238 from dillon-cullinan/tst-coretesting
dillon-cullinan Apr 2, 2021
e45af81
Remove `rapids-pytest-benchmark` dependency
raydouglass Apr 5, 2021
8841624
Merge pull request #239 from rapidsai/remove-rapids-pytest-benchmark
raydouglass Apr 5, 2021
52a7627
Upgrade to Treelite 1.1.0
chyunsu3 Apr 5, 2021
9c8060e
Merge pull request #240 from hcho3/upgrade_treelite
raydouglass Apr 5, 2021
e159504
Upgrading NetworkX to 2.5.1 to restrict decorator pacakge to compatib…
rlratzel Apr 5, 2021
ce99523
bump dask version
kkraus14 Apr 6, 2021
eaf1e13
set distributed version as well
kkraus14 Apr 6, 2021
e9894d7
Merge pull request #242 from kkraus14/dask_version
raydouglass Apr 6, 2021
c5e3476
Merge pull request #241 from rlratzel/branch-0.19-nxupdate
raydouglass Apr 6, 2021
6a80d3a
bump up fsspec and introduce gcsfs_version
galipremsagar Apr 6, 2021
e0489b4
use `gcsfs_version`
galipremsagar Apr 6, 2021
fbc66fa
Merge pull request #244 from galipremsagar/patch-11
mike-wendt Apr 7, 2021
d6bcc8a
Merge remote-tracking branch 'upstream/branch-0.19' into fix-gcver
dillon-cullinan Apr 16, 2021
51ea271
Merge pull request #237 from dillon-cullinan/fix-gcver
dillon-cullinan Apr 16, 2021
a9e1354
FIX Add nlohmann json dep for Blazing
dillon-cullinan Apr 16, 2021
20ca613
Merge pull request #248 from dillon-cullinan/fix-nlohmann
dillon-cullinan Apr 17, 2021
5c999f3
FIX Updatte nlohmann json version
dillon-cullinan Apr 19, 2021
90d0d84
fea_add_transformers
VibhuJawa Apr 19, 2021
aa8609d
FIX Add missing dependency for Blazing
dillon-cullinan Apr 19, 2021
043e0c6
Merge remote-tracking branch 'upstream/branch-0.19' into fix-nlohmann
dillon-cullinan Apr 20, 2021
e5b9a8c
update nightly axis
ajschmidt8 Apr 20, 2021
792e92e
Merge pull request #252 from ajschmidt8/axis-update
ajschmidt8 Apr 20, 2021
b806a3c
Merge branch 'branch-0.19' into fea_add_transformers
ajschmidt8 Apr 20, 2021
b1f4508
Merge branch 'branch-0.19' into fix-nlohmann
dillon-cullinan Apr 20, 2021
db47d25
Merge pull request #251 from dillon-cullinan/fix-nlohmann
dillon-cullinan Apr 20, 2021
dda0e2d
Merge branch 'branch-0.19' into fea_add_transformers
ajschmidt8 Apr 21, 2021
c875e07
Merge pull request #249 from VibhuJawa/fea_add_transformers
ajschmidt8 Apr 21, 2021
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
9 changes: 8 additions & 1 deletion ci/axis/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
3 changes: 2 additions & 1 deletion ci/axis/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ci/axis/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/test/notebooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/blazingsql-build-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions conda/recipes/rapids-build-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <path-to-file>.yaml`
# Manual builds need to use the `conda build` flag of `-m <path-to-file>.yaml`
# to set these versions
###

Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -102,6 +103,7 @@ requirements:
- numba {{ numba_version }}
- numpy {{ numpy_version }}
- nvtx {{ nvtx_version }}
- packaging
- pandas {{ pandas_version }}
- panel {{ panel_version }}
- pickle5 # [py<38]
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/rapids-notebook-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 21 additions & 13 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -43,37 +43,39 @@ 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:
- '=3.1.5'
doxygen_version:
- '>=1.8.12,<=1.8.20'
faiss_version:
- '=1.6.3'
- '=1.7.0'
fastavro_version:
- '>=0.22.0'
flake8_version:
- '=3.8'
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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -128,15 +134,17 @@ 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:
- '=1.7.0'
sphinx_markdown_tables_version:
- '=0.0.14=pyh9f0ad1d_1'
treelite_version:
- '=1.0.0'
- '=1.1.0'