Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
40fc9a6
DOC v21.10 Updates
raydouglass Jul 15, 2021
56190d8
Merge pull request #312 from rapidsai/branch-21.08
GPUtester Jul 16, 2021
17281cb
Merge pull request #314 from rapidsai/branch-21.08
GPUtester Jul 16, 2021
89fe32d
Merge pull request #316 from rapidsai/branch-21.08
GPUtester Jul 20, 2021
ce32322
Merge pull request #320 from rapidsai/branch-21.08
GPUtester Jul 22, 2021
8cd6758
Merge pull request #323 from rapidsai/branch-21.08
GPUtester Jul 22, 2021
04a74c1
Merge pull request #326 from rapidsai/branch-21.08
GPUtester Jul 26, 2021
0ac15b7
Merge pull request #328 from rapidsai/branch-21.08
GPUtester Jul 28, 2021
dd9eba7
Merge pull request #329 from rapidsai/branch-21.08
GPUtester Jul 29, 2021
3bf6093
Upgrade arrow to 5.0.0
galipremsagar Jul 30, 2021
d165b20
Merge pull request #330 from galipremsagar/patch-18
raydouglass Aug 3, 2021
8d75b9e
Revert "Upgrade arrow to `5.0.0`"
galipremsagar Aug 4, 2021
8cf63ad
Merge pull request #333 from galipremsagar/revert-330-patch-18
raydouglass Aug 4, 2021
bea0634
Merge pull request #335 from rapidsai/branch-21.08
GPUtester Aug 4, 2021
1414a57
add pydata-sphinx-theme
galipremsagar Aug 9, 2021
88350b5
Merge pull request #336 from galipremsagar/patch-19
ajschmidt8 Aug 10, 2021
9e72eb4
update arrow to 5.0.0
galipremsagar Aug 10, 2021
05cdb5a
Set minimum `pydata-sphinx-theme` version
ajschmidt8 Aug 11, 2021
795a874
Merge pull request #338 from ajschmidt8/pydata-version
ajschmidt8 Aug 11, 2021
92d61ce
Merge pull request #337 from galipremsagar/patch-20
ajschmidt8 Aug 12, 2021
55e4408
Upgrade build stack from version 9.3 to 9.4
jjacobelli Aug 18, 2021
0fb9d2a
Upgrade gdal to version 3.3
jjacobelli Aug 18, 2021
c20f471
Merge pull request #339 from Ethyling/gcc-9.4
jjacobelli Aug 18, 2021
ea91a9d
Merge branch 'branch-21.10' into gdal
jjacobelli Aug 19, 2021
3c49e62
Merge pull request #340 from Ethyling/gdal
jjacobelli Aug 19, 2021
b00a52e
Bypass unsupported packages for arm64
jjacobelli Aug 20, 2021
9e8af86
Merge pull request #341 from Ethyling/arm64
jjacobelli Aug 20, 2021
4a6ab3e
#1625: Use cugraph's test.sh script in integration tests
jolorunyomi Aug 24, 2021
d9be7d8
Merge pull request #343 from rapidsai/use-cugraph
jolorunyomi Aug 24, 2021
64af87d
Remove cuda 11.0 for arm64
jjacobelli Aug 25, 2021
24de107
Merge pull request #344 from Ethyling/remove-11.0-arm64
jjacobelli Aug 25, 2021
5c7c3e3
upgrade pandas version
galipremsagar Sep 4, 2021
9ebf66e
Merge pull request #345 from galipremsagar/patch-21
jjacobelli Sep 7, 2021
63d50e7
Add jupyterlab-favorites to notebook env
jacobtomlinson Sep 9, 2021
fa29611
ENH Update scikit-learn to 0.24
dantegd Sep 13, 2021
2bd65f6
Merge pull request #349 from rapidsai/branch-21.08
ajschmidt8 Sep 13, 2021
31c95c9
Merge pull request #346 from jacobtomlinson/patch-1
ajschmidt8 Sep 16, 2021
c6eb9cd
Merge branch 'branch-21.10' into sklearn-024
ajschmidt8 Sep 16, 2021
d0e7eb2
Merge pull request #347 from dantegd/sklearn-024
ajschmidt8 Sep 20, 2021
e28b9ba
Add python-snappy for cudf/9181
devavret Sep 20, 2021
e5be4e4
Merge pull request #352 from devavret/add-python-snappy
ajschmidt8 Sep 20, 2021
2c87b52
Upgrade to Treelite 2.1.0
chyunsu3 Sep 21, 2021
4be191f
Bump Dask + Distributed to 2021.9.1
jakirkham Sep 22, 2021
ae77379
Merge pull request #354 from jakirkham/req_dask_2021.9.1
jjacobelli Sep 22, 2021
a3be1d3
Merge branch 'branch-21.10' into upgrade_treelite
jjacobelli Sep 22, 2021
b003231
Merge pull request #353 from hcho3/upgrade_treelite
ajschmidt8 Sep 22, 2021
b935ded
Require exactly Dask + Distributed 2021.9.1
jakirkham Sep 23, 2021
6920f57
Merge pull request #356 from jakirkham/req_dask_exact
ajschmidt8 Sep 23, 2021
c437843
add pyppeteer version >=0.2.6
AjayThorve Sep 27, 2021
d8e868a
Merge pull request #360 from AjayThorve/fix/pyppeteer-version
ajschmidt8 Sep 27, 2021
03c055e
pin transformers
galipremsagar Sep 28, 2021
473f42c
Update versions.yaml
galipremsagar Sep 28, 2021
71cad29
Merge pull request #362 from galipremsagar/patch-23
ajschmidt8 Sep 28, 2021
fb62e1d
Skip imports tests on arm64
jjacobelli Sep 29, 2021
315c5e2
Merge pull request #364 from Ethyling/arm64
jjacobelli Sep 29, 2021
bbee9f8
Add CUDA `11.4` to test axis
ajschmidt8 Oct 1, 2021
3ff1720
Merge pull request #366 from ajschmidt8/update-axis
ajschmidt8 Oct 1, 2021
74cf77b
update cudf tests
ajschmidt8 Oct 1, 2021
ff2ce6c
Merge pull request #368 from ajschmidt8/update-cudf-tests
ajschmidt8 Oct 1, 2021
4afc8b3
Change `cudf` test directory
ajschmidt8 Oct 1, 2021
99bd8d7
Merge pull request #370 from ajschmidt8/update-cudf-tests
ajschmidt8 Oct 1, 2021
1150aae
Update `google_cloud_cpp_version` Pin
ajschmidt8 Oct 4, 2021
4348a97
Merge pull request #372 from ajschmidt8/update-google-pin
ajschmidt8 Oct 4, 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
20 changes: 20 additions & 0 deletions ci/axis/nightly-arm64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
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:
- 21.10.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
- 11.4
- 11.2

PYTHON_VER:
- 3.7
- 3.8

exclude:
2 changes: 1 addition & 1 deletion ci/axis/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 21.08.00a
- 21.10.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Y (major.minor.patch) version to match tag
RAPIDS_VER:
- "21.08.00"
- "21.10.00"

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
3 changes: 2 additions & 1 deletion ci/axis/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ DOCKER_REPO:

# Use M.X (major.minor) version
RAPIDS_VER:
- "21.08"
- "21.10"

CUDA_VER:
- 11.4
- 11.2
- 11.0

Expand Down
13 changes: 9 additions & 4 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ if [[ "$BUILD_MODE" = "branch" && "$SOURCE_BRANCH" = branch-* ]] ; then
export VERSION_SUFFIX=`date +%y%m%d`
fi

# Get arch
ARCH=$(uname -m)

function build_pkg {
# Build pkg
gpuci_logger "Start conda build for '${1}'..."
Expand All @@ -72,7 +75,6 @@ function run_builds {
function upload_builds {

# Check arch
ARCH=$(uname -m)
if [ "${ARCH}" = "x86_64" ]; then
ARCH_DIR="linux-64"
elif [ "${ARCH}" = "aarch64" ]; then
Expand Down Expand Up @@ -118,9 +120,12 @@ if [[ "$BUILD_PKGS" == "env" || -z "$BUILD_PKGS" ]] ; then
# Run builds for env-pkgs
run_builds $CONDA_RAPIDS_BUILD_RECIPE
run_builds $CONDA_RAPIDS_NOTEBOOK_RECIPE
run_builds $CONDA_RAPIDS_DOC_RECIPE
run_builds $CONDA_BLAZING_BUILD_RECIPE
run_builds $CONDA_BLAZING_NOTEBOOK_RECIPE
# Bypass not supported packages for arm64
if [ "${ARCH}" != "aarch64" ]; then
run_builds $CONDA_RAPIDS_DOC_RECIPE
run_builds $CONDA_BLAZING_BUILD_RECIPE
run_builds $CONDA_BLAZING_NOTEBOOK_RECIPE
fi
fi

# Upload builds
Expand Down
Empty file modified ci/release/update-version.sh
100644 → 100755
Empty file.
16 changes: 4 additions & 12 deletions ci/test/cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,24 @@ for gt in /rapids/cudf/cpp/build/gtests/*; do
fi
done

# Python tests
export PYTHONPATH=\
/rapids/cudf/python/cudf:\
/rapids/cudf/python/dask_cudf:\
/rapids/cudf/python/custreamz:\
/rapids/cudf/python/nvstrings:\
${PYTHONPATH}

cd /rapids/cudf/python/cudf
py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-cudf.xml -v
cd /rapids/cudf/python/cudf/cudf/tests
pytest -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-cudf.xml -v
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
echo "FAILED: 1 or more python tests"
fi

cd /rapids/cudf/python/dask_cudf
py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-dask-cudf.xml -v
pytest -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-dask-cudf.xml -v
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
echo "FAILED: 1 or more python tests"
fi

cd /rapids/cudf/python/custreamz
py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v
pytest -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
Expand Down
41 changes: 3 additions & 38 deletions ci/test/cugraph.sh
Original file line number Diff line number Diff line change
@@ -1,47 +1,12 @@
#!/bin/bash
set +e
set -x

export HOME="${WORKSPACE}"
export LIBCUDF_KERNEL_CACHE_PATH="${WORKSPACE}/.jitcache"
export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/local/gcc7/bin:/usr/sbin:/usr/bin:/sbin:/bin"

# FIXME: "source activate" line should not be needed
source /opt/conda/bin/activate rapids

# Get datasets
cd /rapids/cugraph/datasets
bash ./get_test_data.sh
export RAPIDS_DATASET_ROOT_DIR=/rapids/cugraph/datasets

# Show environment
env
nvidia-smi
conda list

# Install pytest plugin for cugraph
conda install rapids-pytest-benchmark

TESTRESULTS_DIR="${WORKSPACE}/testresults"
mkdir -p ${TESTRESULTS_DIR}
SUITEERROR=0

# gtests
for gt in /rapids/cugraph/cpp/build/tests/*_TEST; do
# FIXME: remove this ASAP
${gt} --gtest_output=xml:${TESTRESULTS_DIR}/
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
echo "FAILED: ${gt}"
fi
done

# Python tests
pytest --ignore=/rapids/cugraph/python/cugraph/raft --junitxml=${TESTRESULTS_DIR}/pytest.xml -v /rapids/cugraph/python
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
echo "FAILED: 1 or more tests in /rapids/cugraph/python"
fi

exit ${SUITEERROR}
cd /rapids/cugraph
bash /rapids/cugraph/ci/test.sh
5 changes: 3 additions & 2 deletions conda/recipes/rapids-build-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ requirements:
- pydocstyle {{ pydocstyle_version }}
- pynvml
- pyorc
# - pyppeteer {{ pyppeteer_version }}
- pyppeteer {{ pyppeteer_version }}
- pyproj {{ pyproj_version }}
- pytest
- pytest-asyncio {{ pytest_asyncio_version }}
Expand All @@ -127,6 +127,7 @@ requirements:
- python
- python-confluent-kafka {{ python_confluent_kafka_version }}
- python-louvain
- python-snappy
- rapidjson {{ rapidjson_version }}
- ripgrep
- s3fs {{ s3fs_version }}
Expand All @@ -138,7 +139,7 @@ requirements:
- spdlog {{ spdlog_version }}
- statsmodels
- streamz
- transformers
- transformers {{ transformers_version }}
- treelite {{ treelite_version }}
- twine
- typing_extensions
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 @@ -42,6 +42,7 @@ requirements:
- nbsphinx {{ nbsphinx_version }}
- numpydoc
- pandoc {{ pandoc_version }}
- pydata-sphinx-theme {{ pydata_sphinx_theme_version }}
- recommonmark
- sphinx
- sphinx_rtd_theme
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 @@ -51,6 +51,7 @@ requirements:
- ipywidgets
- jupyter-server-proxy
- jupyterlab {{ jupyterlab_version }}
- jupyterlab-favorites
- jupyterlab-nvdashboard
- jupyter-packaging {{ jupyter_packaging_version }}
- jupyterlab_widgets
Expand Down
14 changes: 7 additions & 7 deletions conda/recipes/rapids/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ requirements:
- rapids-xgboost ={{ minor_version }}.*
- rmm ={{ minor_version }}.*

test:
imports:
- cudf
- dask_cudf
- cuml
- cugraph
- cuspatial
test: # [linux64]
imports: # [linux64]
- cudf # [linux64]
- dask_cudf # [linux64]
- cuml # [lunux64]
- cugraph # [linux64]
- cuspatial # [linux64]

about:
home: http://rapids.ai/
Expand Down
24 changes: 14 additions & 10 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ conda_verify_version:

# Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack
build_stack_version:
- '=9.3.0'
- '=9.4.0'

# Shared versions across meta-pkgs
arrow_version:
- '=4.0.1'
- '=5.0.0'
benchmark_version:
- '=1.5.1'
black_version:
Expand All @@ -47,11 +47,11 @@ cupy_version:
cython_version:
- '>=0.29.17,<0.30'
dask_version:
- '>=2021.6.0,<=2021.07.1'
- '=2021.9.1'
datashader_version:
- '>=0.11.1,<0.12'
distributed_version:
- '>=2021.6.0,<=2021.07.1'
- '=2021.9.1'
dlpack_version:
- '>=0.5,<0.6.0a0'
double_conversion_version:
Expand All @@ -67,13 +67,13 @@ flake8_version:
fsspec_version:
- '>=0.9.0'
gdal_version:
- '>=3.2.0,<3.3.0a0'
- '>=3.3.0,<3.4.0a0'
geopandas_version:
- '>=0.9.0,<0.10.0a0'
gcsfs_version:
- '>=0.8.0'
google_cloud_cpp_version:
- '>=1.25.0'
- '>=1.25.0,<1.30'
gmock_version:
- '=1.10.0'
gtest_version:
Expand Down Expand Up @@ -115,7 +115,7 @@ nvtx_version:
openjdk_version:
- '>=8.0'
pandas_version:
- '>=1.0,<1.3.0dev0'
- '>=1.0,<1.4.0dev0'
pandoc_version:
- '<=2.0.0'
panel_version:
Expand All @@ -130,10 +130,12 @@ pytorch_version:
- '>=1.6'
protobuf_version:
- '>=3.4.1,<4.0.0'
pydata_sphinx_theme_version:
- '>=0.6.3'
pyproj_version:
- '>=2.4,<=3.1'
pyppeteer_version:
- '<=0.2.2'
- '>=0.2.6'
pytest_asyncio_version:
- '<0.14.0'
rapidjson_version:
Expand All @@ -143,7 +145,7 @@ s3fs_version:
scikit_image_version:
- '>=0.18.0,<0.19.0'
scikit_learn_version:
- '=0.23.1'
- '=0.24'
scipy_version:
- '=1.6.0'
setuptools_version:
Expand All @@ -153,4 +155,6 @@ spdlog_version:
sphinx_markdown_tables_version:
- '=0.0.14=pyh9f0ad1d_1'
treelite_version:
- '=2.0.0'
- '=2.1.0'
transformers_version:
- '<=4.10.3'