Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
574b1b9
bump cmake to 3.18.0
kkraus14 Aug 8, 2020
cba562e
datashader version supporting rapids 0.14 and above
AjayThorve Aug 18, 2020
f56c10a
Change to cmake 3.17 as we're not quite ready for 3.18 yet
kkraus14 Aug 27, 2020
5ee519d
pinning doxygen version to avoid potential confusion when its default…
teju85 Aug 28, 2020
bb928c8
added version definition inside versions.yaml + used a less stricter …
teju85 Aug 28, 2020
f9d3a88
Merge pull request #117 from kkraus14/upgrade_cmake
mike-wendt Sep 2, 2020
4324de7
Merge pull request #121 from teju85/enh-ext-fix-doxygen-version
mike-wendt Sep 2, 2020
f95edd4
Update to Arrow v1.0.1
trxcllnt Sep 3, 2020
461a53a
Update spdlog version to align with RMM
trxcllnt Sep 5, 2020
418669a
Merge pull request #123 from trxcllnt/patch-4
mike-wendt Sep 8, 2020
9900ff9
Merge pull request #127 from rapidsai/branch-0.15
raydouglass Sep 8, 2020
ffd755d
Merge pull request #122 from trxcllnt/patch-3
dillon-cullinan Sep 8, 2020
88b4e5a
Merge pull request #112 from AjayThorve/datashader_version_fix
raydouglass Sep 9, 2020
d9e9634
Update meta.yaml
ajschmidt8 Sep 10, 2020
aa88aed
Merge pull request #129 from rapidsai/add-jupyter-sphinx
ajschmidt8 Sep 10, 2020
ec89db2
added nltk to rapids-build-env/meta.yaml
VibhuJawa Sep 15, 2020
7a19e4f
Update tests.yaml
ajschmidt8 Sep 15, 2020
8b16e95
Update nightly.yaml
ajschmidt8 Sep 15, 2020
4f8f0ee
Update release.yaml
ajschmidt8 Sep 15, 2020
01838fb
Merge pull request #130 from VibhuJawa/fea_add_nltk_rapids_build_env
ajschmidt8 Sep 15, 2020
2e54ba5
alphabetize dependencies
ajschmidt8 Sep 15, 2020
3913ffc
Fix test_pagerank.py
ajschmidt8 Sep 17, 2020
c3942d6
Merge pull request #133 from rapidsai/fix-integration-tests
ajschmidt8 Sep 17, 2020
370eb55
Merge pull request #131 from rapidsai/update-branches
ajschmidt8 Sep 17, 2020
0906ad1
Require Cython 0.29.17+
jakirkham Sep 18, 2020
0ecc5d1
Merge pull request #134 from jakirkham/use_cython_0.29.17
raydouglass Sep 18, 2020
d159bca
fix readme logo
ajschmidt8 Sep 21, 2020
9e5a1c7
upgrade_librdkafka
kkraus14 Sep 25, 2020
5413adb
add missing notebook dependencies
ajschmidt8 Sep 28, 2020
484a436
Add mypy 0.782 to rapids-build-env
shwina Sep 29, 2020
3dd8103
add networkx to rapids recipe
ajschmidt8 Sep 30, 2020
9949691
use networkx pin for notebook-env
ajschmidt8 Sep 30, 2020
20b4d64
Merge pull request #138 from rapidsai/networkx
dillon-cullinan Sep 30, 2020
6dc4645
Merge pull request #136 from rapidsai/add-notebook-deps
ajschmidt8 Sep 30, 2020
2707741
Merge pull request #135 from kkraus14/upgrade_librdkafka
ajschmidt8 Sep 30, 2020
4363f2b
Merge branch 'branch-0.16' into add-mypy
ajschmidt8 Sep 30, 2020
f5bec3d
Merge pull request #137 from shwina/add-mypy
kkraus14 Sep 30, 2020
83d7b7e
Permit cupy 8
JohnZed Oct 2, 2020
0151459
Update cupy spec to >7.1
JohnZed Oct 2, 2020
b6e714f
Require `nvtx`
jakirkham Oct 5, 2020
8c31f09
Merge pull request #139 from JohnZed/enh-cupy8
raydouglass Oct 5, 2020
84037c3
Add v0.17 to axis
raydouglass Oct 5, 2020
d82e4b8
Merge pull request #141 from jakirkham/req_nvtx
ajschmidt8 Oct 5, 2020
c1c3b88
Merge pull request #142 from rapidsai/v0.17-axis
raydouglass Oct 5, 2020
608605c
ENH Remove dask-xgboost
raydouglass Oct 6, 2020
3ff92d8
FIX pin faiss to =1.6.3
dantegd Oct 7, 2020
5400163
FIX Use xgboost v0.16 for both 0.16/0.17
mike-wendt Oct 7, 2020
1b9f212
STY Cleanup whitespace
mike-wendt Oct 7, 2020
f3ff816
Merge pull request #143 from rapidsai/remove-dask-xgboost
mike-wendt Oct 8, 2020
4ca3fe6
Merge pull request #145 from dantegd/016-fix-pin-faiss
mike-wendt Oct 8, 2020
be976c9
FIX Add setuptools to rapids meta pkg
mike-wendt Oct 8, 2020
59f87c9
FIX Add setuptools pinning
mike-wendt Oct 8, 2020
45f25c1
Merge pull request #147 from rapidsai/fix-conda-solver-issues
mike-wendt Oct 8, 2020
e076542
Update versions.yaml
afender Oct 8, 2020
7649854
Merge pull request #148 from afender/branch-0.16
mike-wendt Oct 8, 2020
2a298ff
FIX Update dlpack to match libcudf pinning
mike-wendt Oct 9, 2020
4b581df
Merge pull request #149 from rapidsai/fix-update-dlpack
mike-wendt Oct 9, 2020
214c29c
Use `matplotlib-base` instead of `matplotlib`
jakirkham Oct 9, 2020
f2a0067
Merge pull request #150 from jakirkham/use_mpl-base
ajschmidt8 Oct 12, 2020
84c3960
Upgrade Treelite to 0.93
chyunsu3 Oct 13, 2020
ac42f28
Merge pull request #151 from hcho3/patch-1
raydouglass Oct 13, 2020
edebf29
FIX Remove test rebuilding from nightly testing
dillon-cullinan Oct 14, 2020
80c7114
Merge pull request #152 from dillon-cullinan/fix-cudfgtest
dillon-cullinan Oct 14, 2020
e302c9e
add filterpy to notebook-env
ajschmidt8 Oct 15, 2020
3f61305
add pytorch to ci/test/notebooks.sh
ajschmidt8 Oct 15, 2020
c4714f7
only install pytorch on supported cuda versions
ajschmidt8 Oct 15, 2020
3a57281
Merge pull request #153 from rapidsai/notebook-updates
ajschmidt8 Oct 15, 2020
853f13d
ENH Update conda/conda-build versions
mike-wendt Oct 15, 2020
178622c
ENH Drop conda version
mike-wendt Oct 16, 2020
f6496b6
ENH Drop conda from build-env
mike-wendt Oct 16, 2020
178957b
Merge pull request #154 from rapidsai/enh-conda-bump
mike-wendt Oct 16, 2020
cccf9d9
Revert "ENH Remove conda from `build-env` and update conda-build vers…
mike-wendt Oct 16, 2020
234f933
FIX Keep version bumps for conda/conda-build
mike-wendt Oct 16, 2020
a8d4495
Merge pull request #155 from rapidsai/revert-154-enh-conda-bump
mike-wendt Oct 16, 2020
ba161d4
FIX Pin pytorch to avoid incorrect solving
dillon-cullinan Oct 16, 2020
44e3a1e
Merge pull request #157 from dillon-cullinan/fix-pytorchpin
ajschmidt8 Oct 16, 2020
9ba6d34
Temporarily disabling all cugraph C++ tests for 0.16 due to intermitt…
rlratzel Oct 20, 2020
9f9fbc9
Merge pull request #158 from rlratzel/branch-0.16-cugraphcpptestdisable
ajschmidt8 Oct 21, 2020
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# <div align="left"><img src="https://rapids.ai/assets/images/rapids_logo.png" width="90px"/>&nbsp; Integration
# <div align="left"><img src="https://rapids.ai/assets/images/RAPIDS-logo-white.svg" width="90px"/>&nbsp; Integration

RAPIDS - combined conda package &amp; integration tests for all of RAPIDS libraries

Expand Down
2 changes: 1 addition & 1 deletion ci/axis/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ CONDA_CONFIG_FILE:
- conda/recipes/versions.yaml

RAPIDS_VER:
- 0.15.0a
- 0.16.0a
- 0.17.0a

# 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 @@ -5,7 +5,7 @@ CONDA_CONFIG_FILE:
- conda/recipes/versions.yaml

RAPIDS_VER:
- 0.15.1
- 0.16

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

RAPIDS_VER:
- 0.15
- 0.16

CUDA_VER:
- 11.0
Expand Down
6 changes: 0 additions & 6 deletions ci/test/cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ TESTRESULTS_DIR=${WORKSPACE}/testresults
mkdir -p ${TESTRESULTS_DIR}
SUITEERROR=0

# build gtests
pushd /rapids/cudf/cpp/build
make build_tests_cudf
SUITEERROR=$((SUITEERROR | $?))
popd

# run gtests
for gt in /rapids/cudf/cpp/build/gtests/*; do
${gt} --gtest_output=xml:${TESTRESULTS_DIR}/
Expand Down
21 changes: 12 additions & 9 deletions ci/test/cugraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@ TESTRESULTS_DIR=${WORKSPACE}/testresults
mkdir -p ${TESTRESULTS_DIR}
SUITEERROR=0

# FIXME: temporarily disabling all C++ tests for 0.16 due to intermittent
# failures from what appears to be an issue with Thrust (which does not appear
# to affect the Python API or notebooks). Re-enable once this issue is resolved
# in 0.17.
# gtests
for gt in /rapids/cugraph/cpp/build/gtests/*_TEST; do
# FIXME: remove this ASAP
${gt} --gtest_output=xml:${TESTRESULTS_DIR}/
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
echo "FAILED: ${gt}"
fi
done
# for gt in /rapids/cugraph/cpp/build/gtests/*_TEST; do
# ${gt} --gtest_output=xml:${TESTRESULTS_DIR}/
# exitcode=$?
# if (( ${exitcode} != 0 )); then
# SUITEERROR=${exitcode}
# echo "FAILED: ${gt}"
# fi
# done

# Python tests
py.test --junitxml=${TESTRESULTS_DIR}/pytest.xml -v /rapids/cugraph/python
Expand Down
16 changes: 15 additions & 1 deletion ci/test/notebooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,23 @@ set -o pipefail
export LIBCUDF_KERNEL_CACHE_PATH=${WORKSPACE}/.jitcache

source /opt/conda/bin/activate rapids

# PyTorch is intentionally excluded from our Docker images due
# to its size, but some notebooks still depend on it.
case "${CUDA_VER}" in
"10.1" | "10.2")
conda install -y -c pytorch "pytorch>=1.4"
;;
*)
echo "Unsupported CUDA version for pytorch."
echo "Not installing pytorch."
;;
esac


env
/test.sh 2>&1 | tee nbtest.log
EXITCODE=$?
python /rapids/utils/nbtestlog2junitxml.py nbtest.log

exit ${EXITCODE}
exit ${EXITCODE}
3 changes: 3 additions & 0 deletions conda/recipes/rapids-build-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,13 @@ requirements:
- make
- mimesis
- moto
- mypy {{ mypy_version }}
- nccl {{ nccl_version }}
- networkx {{ networkx_version }}
- nltk
- numba {{ numba_version }}
- numpy {{ numpy_version }}
- nvtx {{ nvtx_version }}
- pandas {{ pandas_version }}
- panel {{ panel_version }}
- pickle5 # [py<38]
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/rapids-doc-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ requirements:
- pip
run:
- beautifulsoup4
- doxygen
- doxygen {{ doxygen_version }}
- jupyter_sphinx
- markdown
- nbsphinx
- numpydoc
Expand Down
13 changes: 8 additions & 5 deletions conda/recipes/rapids-notebook-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 @@ -42,13 +42,16 @@ requirements:
- cython {{ cython_version }}
- dask-labextension
- dask-ml
- filterpy
- holoviews
- ipython {{ ipython_version }}
- jupyter-server-proxy
- jupyterlab {{ jupyterlab_version }}
- matplotlib
- networkx
- matplotlib-base
- networkx {{ networkx_version }}
- nodejs {{ nodejs_version }}
- pytest
- s3fs
- scikit-learn {{ scikit_learn_version }}
- scipy {{ scipy_version }}
- seaborn
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/rapids-xgboost/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-meta.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 All @@ -38,7 +38,7 @@ requirements:
- cudatoolkit ={{ cuda_version }}.*
- nccl {{ nccl_version }}
- python
- xgboost {{ xgboost_version }}{{ minor_version }}
- xgboost {{ xgboost_version }}

about:
home: http://rapids.ai/
Expand Down
14 changes: 8 additions & 6 deletions conda/recipes/rapids/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-meta.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 All @@ -38,10 +38,13 @@ requirements:
- cudatoolkit ={{ cuda_version }}.*
- cupy {{ cupy_version }}
- nccl {{ nccl_version }}
- networkx {{ networkx_version }}
- numba {{ numba_version }}
- numpy {{ numpy_version }}
- nvtx {{ nvtx_version }}
- pickle5 # [py<38]
- python
- setuptools {{ setuptools_version }}
- cudf ={{ minor_version }}.*
- cugraph ={{ minor_version }}.*
- cuml ={{ minor_version }}.*
Expand All @@ -50,7 +53,6 @@ requirements:
- custreamz ={{ minor_version }}.*
- cuxfilter ={{ minor_version }}.*
- dask-cuda ={{ minor_version }}.*
- dask-xgboost {{ dask_xgboost_version }}
- rapids-xgboost ={{ minor_version }}.*
- rmm ={{ minor_version }}.*

Expand All @@ -68,8 +70,8 @@ about:
license_file: conda/recipes/rapids/LICENSE
summary: 'RAPIDS Suite - Open GPU Data Science'
description: |
Meta-package for the RAPIDS suite of software libraries. RAPIDS gives you the freedom to execute end-to-end data science
and analytics pipelines entirely on GPUs. It relies on NVIDIA® CUDA® primitives for low-level compute optimization,
Meta-package for the RAPIDS suite of software libraries. RAPIDS gives you the freedom to execute end-to-end data science
and analytics pipelines entirely on GPUs. It relies on NVIDIA® CUDA® primitives for low-level compute optimization,
but exposes that GPU parallelism and high-bandwidth memory speed through user-friendly Python interfaces.
doc_url: https://docs.rapids.ai/
dev_url: https://github.com/rapidsai/
36 changes: 22 additions & 14 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ dask_xgboost_version:

# Versions for `rapids-xgboost` meta-pkg
xgboost_version:
- '=1.2.0dev.rapidsai'
- '=1.2.0dev.rapidsai0.16'

# Versions for conda
conda_version:
- '=4.7.12'
- '=4.8.3'
conda_build_version:
- '=3.18.11'
- '=3.20.3'
conda_verify_version:
- '=3.1.1'

Expand All @@ -24,7 +24,7 @@ build_stack_version:

# Shared versions across meta-pkgs
arrow_version:
- '=0.17.1'
- '=1.0.1'
benchmark_version:
- '=1.5.1'
black_version:
Expand All @@ -36,25 +36,27 @@ boost_cpp_version:
clang_version:
- '=8.0.1'
cmake_version:
- '=3.14.5'
- '=3.17'
cmake_setuptools_version:
- '>=0.1.3'
cupy_version:
- '>=7.1.0,<8.0.0a0'
- '>7.1.0,<9.0.0a0'
cython_version:
- '>=0.29.14,<0.30'
- '>=0.29.17,<0.30'
dask_version:
- '>=2.23.0'
datashader_version:
- '>=0.10'
- '>=0.11.1'
distributed_version:
- '>=2.23.0'
dlpack_version:
- '=0.2'
- '>=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.6.3'
fastavro_version:
- '>=0.22.0'
flake8_version:
Expand All @@ -78,9 +80,11 @@ isort_version:
jupyterlab_version:
- '=2.1'
librdkafka_version:
- '=1.4.2'
- '=1.5.0'
mypy_version:
- '0.782'
nccl_version:
- '>=2.7.6.1,<2.8'
- '>=2.7.8.1,<3.0a0'
networkx_version:
- '>=2.3'
nodejs_version:
Expand All @@ -89,6 +93,8 @@ numba_version:
- '>=0.51.2'
numpy_version:
- '>=1.17.3'
nvtx_version:
- '>=0.2.1,<0.3'
pandas_version:
- '>=1.0,<1.2.0dev0'
pandoc_version:
Expand All @@ -109,9 +115,11 @@ scikit_learn_version:
- '=0.23.1'
scipy_version:
- '=1.5.1'
setuptools_version:
- '>=49,<50'
spdlog_version:
- '=1.6.0'
- '=1.7.0'
sphinx_markdown_tables_version:
- '=0.0.14=pyh9f0ad1d_1'
treelite_version:
- '=0.92'
- '=0.93'
4 changes: 1 addition & 3 deletions test/cugraph/test_pagerank.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,11 @@ def test_pagerank() :
import cugraph

gdf = read_csv_file(csvFile)
sources = gdf['0']
destinations = gdf['1']

# Assuming that data has been loaded into a cuDF (using read_csv) Dataframe
# create a Graph using the source and destination vertex pairs
G = cugraph.Graph()
G.add_edge_list(sources, destinations, None)
G.from_cudf_edgelist(gdf, "0", "1")

# Call cugraph.pagerank to get the pagerank scores
# Sort values since renumbering may have changed expected order
Expand Down