Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
37ae63d
FIX Xgboost version is based on rapids minor version
raydouglass Dec 7, 2020
52fc6c7
Add pytest-xdist
galipremsagar Dec 9, 2020
fc06158
parallelize pytests in cudf
galipremsagar Dec 9, 2020
182ce44
ENH Remove 0.17 from branch-0.18
mike-wendt Dec 9, 2020
b59ec6d
ENH Remove 0.17 from branch-0.18
mike-wendt Dec 9, 2020
be86398
ENH Remove 0.17 from branch-0.18
mike-wendt Dec 9, 2020
0450a30
Merge branch 'branch-0.18' into xgboost-fix
mike-wendt Dec 9, 2020
9c5b934
Merge pull request #183 from raydouglass/xgboost-fix
mike-wendt Dec 9, 2020
3619660
Merge branch 'branch-0.18' into enh-updates-018
mike-wendt Dec 9, 2020
92859ec
FIX Allow blazing meta pkgs to fail
mike-wendt Dec 9, 2020
58a69a1
FIX Add rapids-pytest-benchmark pkg for cugraph tests
mike-wendt Dec 9, 2020
790a7d1
Merge pull request #189 from rapidsai/enh-updates-018
mike-wendt Dec 9, 2020
ad56df5
Merge branch 'branch-0.18' into fix-cugraph-nightly-test-018
mike-wendt Dec 9, 2020
dbcd6b6
FIX Add channel selector for rapids-pytest-benchmark
mike-wendt Dec 10, 2020
4f62456
REV Remove channel pins for asvdb/rapids-pytest-benchmark
mike-wendt Dec 10, 2020
c15989d
Parallelize custreamz pytests
galipremsagar Dec 10, 2020
a4ef853
Add typing extensions
shwina Dec 10, 2020
6ebf11e
Merge branch 'branch-0.17' into branch-0.18
mike-wendt Dec 11, 2020
a497c6b
Merge pull request #195 from shwina/add-typing-extensions
mike-wendt Dec 14, 2020
8882ab4
Merge pull request #188 from galipremsagar/patch-7
mike-wendt Dec 14, 2020
0544e98
Merge pull request #192 from rapidsai/fix-cugraph-nightly-test-018
mike-wendt Dec 14, 2020
423f523
TST Unpin build_stack
mike-wendt Dec 14, 2020
f3d4b40
Merge pull request #199 from rapidsai/tst-unpinned-build-stack
mike-wendt Dec 15, 2020
7ad7b71
Revert "ENH Open gcc pinning to allow for new conda-forge gcc 9.3 pkgs"
mike-wendt Dec 16, 2020
2ba2584
Merge pull request #200 from rapidsai/revert-199-tst-unpinned-build-s…
mike-wendt Dec 16, 2020
0d6eeab
Upgrade to Treelite 1.0.0rc1
chyunsu3 Dec 30, 2020
bdd9337
Try libgcc 9.3.0
chyunsu3 Dec 30, 2020
8596d02
Revert "Try libgcc 9.3.0"
chyunsu3 Jan 5, 2021
6805cb3
Merge pull request #201 from hcho3/upgrade_treelite
ajschmidt8 Jan 5, 2021
501066d
upgrade build stack to 9.3.0
kkraus14 Jan 13, 2021
689e1a1
bump scipy patch version to fix fortran version issue
kkraus14 Jan 13, 2021
c7a0293
Pin gdal to 3.1.x
weiji14 Jan 14, 2021
3cc4032
Merge pull request #204 from weiji14/patch-1
kkraus14 Jan 15, 2021
2c17e05
Add version spec for moto for build env. Update s3fs version spec
ayushdg Jan 16, 2021
9ba3421
FIX Update cupy to >= 7.8
dantegd Jan 19, 2021
3ca640f
FIX Typo in cupy >= 7.8
dantegd Jan 19, 2021
42bf717
Merge pull request #207 from ayushdg/moto_s3fs_update
ajschmidt8 Jan 19, 2021
2cf71f8
update panel version dependency
AjayThorve Jan 21, 2021
f8b0b4d
Upgrade to Treelite 1.0.0
chyunsu3 Jan 21, 2021
b108606
Merge pull request #209 from AjayThorve/update_cuxfilter_dependencies
ajschmidt8 Jan 21, 2021
ecd9013
Merge pull request #208 from dantegd/018-fix-cupy78
ajschmidt8 Jan 21, 2021
89aa2ec
Merge pull request #210 from hcho3/upgrade_treelite
ajschmidt8 Jan 25, 2021
91f53a4
Merge pull request #202 from kkraus14/build_stack_9_3
mike-wendt Feb 1, 2021
aa915fd
ENH Add v0.19 to nightly & tests
raydouglass Feb 3, 2021
f03bf50
Merge pull request #212 from raydouglass/v0.19
raydouglass Feb 3, 2021
4788b9d
update nodejs spec
ajschmidt8 Feb 10, 2021
3649a60
FIX Bump xgboost to 1.3.3
raydouglass Feb 11, 2021
22fcff8
adding pyorc to build env
ramakrishnap-nv Feb 11, 2021
1190c4f
Merge pull request #214 from raydouglass/xgboost-1.3.3
raydouglass Feb 11, 2021
83250b3
add sort=True to groupby
kkraus14 Feb 11, 2021
ef03dcd
Merge pull request #216 from kkraus14/fix_groupby_sort_test
raydouglass Feb 11, 2021
0411f46
set a relative tolerance to 1e-3, this is mostly a test that cugraph …
ChuckHastings Feb 11, 2021
46e2587
Merge pull request #217 from ChuckHastings/bug_pagerank_needs_relativ…
raydouglass Feb 12, 2021
50a1c65
ENH Add ninja to build environment
dillon-cullinan Feb 12, 2021
cab385f
Merge pull request #215 from rgsl888prabhu/add_pyorc_to_inte
raydouglass Feb 13, 2021
38e245e
Merge pull request #218 from dillon-cullinan/enh-addninja
dillon-cullinan Feb 13, 2021
89e1c23
Merge pull request #213 from ajschmidt8/nodejs
ajschmidt8 Feb 16, 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
3 changes: 2 additions & 1 deletion ci/axis/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 0.17.0a
- 0.18.0a
- 0.19.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 @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Y (major.minor.patch) version to match tag
RAPIDS_VER:
- 0.17.0
- 0.18.0

# 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,7 +6,8 @@ DOCKER_REPO:

# Use M.X (major.minor) version
RAPIDS_VER:
- 0.17
- 0.18
- 0.19

CUDA_VER:
- 11.0
Expand Down
6 changes: 3 additions & 3 deletions ci/test/cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,23 @@ export PYTHONPATH=\
${PYTHONPATH}

cd /rapids/cudf/python/cudf
py.test --junitxml=${TESTRESULTS_DIR}/pytest-cudf.xml -v
py.test -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 --junitxml=${TESTRESULTS_DIR}/pytest-dask-cudf.xml -v
py.test -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 --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v
py.test -n 6 --junitxml=${TESTRESULTS_DIR}/pytest-custreamz.xml -v
exitcode=$?
if (( ${exitcode} != 0 )); then
SUITEERROR=${exitcode}
Expand Down
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 @@ -93,10 +93,11 @@ requirements:
- lightgbm
- make
- mimesis
- moto
- moto {{ moto_version }}
- mypy {{ mypy_version }}
- nccl {{ nccl_version }}
- networkx {{ networkx_version }}
- ninja
- nltk
- numba {{ numba_version }}
- numpy {{ numpy_version }}
Expand All @@ -110,20 +111,22 @@ requirements:
- pyarrow {{ arrow_version }}
- pydeck {{ pydeck_version }}
- pynvml
- pyorc
- pyppeteer {{ pyppeteer_version }}
- pyproj {{ pyproj_version }}
- pytest
- pytest-asyncio {{ pytest_asyncio_version }}
- pytest-benchmark
- pytest-cov
- pytest-timeout
- pytest-xdist
- python
- python-confluent-kafka {{ python_confluent_kafka_version }}
- python-louvain
- rapidjson {{ rapidjson_version }}
- rapids-pytest-benchmark
- ripgrep
- s3fs
- s3fs {{ s3fs_version }}
- setuptools
- scikit-learn {{ scikit_learn_version }}
- scipy {{ scipy_version }}
Expand All @@ -133,6 +136,7 @@ requirements:
- streamz
- treelite {{ treelite_version }}
- twine
- typing_extensions
- ucx-proc=*=gpu
- ucx
- umap-learn
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/rapids-notebook-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ requirements:
- networkx {{ networkx_version }}
- nodejs {{ nodejs_version }}
- pytest
- s3fs
- s3fs {{ s3fs_version }}
- scikit-learn {{ scikit_learn_version }}
- scipy {{ scipy_version }}
- seaborn
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/rapids-xgboost/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ requirements:
- cudatoolkit ={{ cuda_version }}.*
- nccl {{ nccl_version }}
- python
- xgboost {{ xgboost_version }}
- xgboost {{ xgboost_version }}{{ minor_version }}

about:
home: http://rapids.ai/
Expand Down
21 changes: 12 additions & 9 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ dask_xgboost_version:

# Versions for `rapids-xgboost` meta-pkg
xgboost_version:
- '=1.3.0dev.rapidsai0.17'
# Minor version is appended in meta.yaml
- '=1.3.3dev.rapidsai'

# Versions for conda
conda_version:
Expand All @@ -20,7 +21,7 @@ conda_verify_version:

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

# Shared versions across meta-pkgs
arrow_version:
Expand All @@ -42,7 +43,7 @@ cmake_format_version:
cmake_setuptools_version:
- '>=0.1.3'
cupy_version:
- '>7.1.0,<9.0.0a0'
- '>=7.8.0,<9.0.0a0'
cython_version:
- '>=0.29.17,<0.30'
dask_version:
Expand All @@ -68,7 +69,7 @@ flatbuffers_version:
fsspec_version:
- '>=0.6.0'
gdal_version:
- '>=3.0.2,<3.1.0a0'
- '>=3.1.0,<3.2.0a0'
geopandas_version:
- '>=0.6, <=0.8.1'
google_cloud_cpp_version:
Expand All @@ -85,14 +86,16 @@ jupyterlab_version:
- '=2.1'
librdkafka_version:
- '=1.5.*'
moto_version:
- '>=1.3.14'
mypy_version:
- '0.782'
nccl_version:
- '>=2.7.8.1,<3.0a0'
networkx_version:
- '>=2.3'
nodejs_version:
- '>=12'
- '>=12,<15'
numba_version:
- '>=0.51.2'
numpy_version:
Expand All @@ -106,7 +109,7 @@ pandas_version:
pandoc_version:
- '<=2.0.0'
panel_version:
- '>=0.9.1, <=0.9.7'
- '>=0.10.3'
pydeck_version:
- '>=0.3, <=0.5.0'
python_confluent_kafka_version:
Expand All @@ -124,16 +127,16 @@ pytest_asyncio_version:
rapidjson_version:
- '=1.1.0'
s3fs_version:
- '>=0.5.1'
- '>=0.5.2'
scikit_learn_version:
- '=0.23.1'
scipy_version:
- '=1.5.1'
- '=1.5.3'
setuptools_version:
- '>=49,<50'
spdlog_version:
- '=1.7.0'
sphinx_markdown_tables_version:
- '=0.0.14=pyh9f0ad1d_1'
treelite_version:
- '=0.93'
- '=1.0.0'
2 changes: 1 addition & 1 deletion test/cudf/test_diningparty.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_diningparty() :
tips_df['tip_percentage'] = tips_df['tip']/tips_df['total_bill']*100

# compute the average tip by dining party size
cudfSeries = tips_df.groupby('size').tip_percentage.mean()
cudfSeries = tips_df.groupby('size', sort=True).tip_percentage.mean()

# the expected average tip percentage for parties sized 1, 2, 3,
# etc. for the data set.
Expand Down
2 changes: 1 addition & 1 deletion test/cugraph/test_pagerank.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ def test_pagerank() :
assert len(expectedPageRanks) == len(gdf_page["pagerank"])
for (actual, expected) in zip(gdf_page["pagerank"].to_pandas(),
expectedPageRanks):
assert actual == pytest.approx(expected)
assert actual == pytest.approx(expected, rel=1e-3)