Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REVIEW] Branch 0.15 merge 0.14 #935

Merged
merged 10 commits into from
Jun 5, 2020
Merged

[REVIEW] Branch 0.15 merge 0.14 #935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fac1b5
Update CHANGELOG.md
raydouglass Jun 2, 2020
6a82825
Update scikit learn dependency
hlinsen Jun 2, 2020
b764e8c
Update changelog
hlinsen Jun 2, 2020
da0a9f8
Merge pull request #927 from hlinsen/fa2-ci
raydouglass Jun 2, 2020
0b0263f
Update scikit version to support libgcc-ng 7.3
dillon-cullinan Jun 3, 2020
68c5b62
Changelog
dillon-cullinan Jun 3, 2020
8f077b8
Merge pull request #928 from dillon-cullinan/fix-scikitver
raydouglass Jun 3, 2020
a9b73ef
Merge branch 'branch-0.14' into branch-0.15-merge-0.14
BradReesWork Jun 4, 2020
d949963
merge fix
BradReesWork Jun 5, 2020
9e48ab0
updated
BradReesWork Jun 5, 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
Prev Previous commit
Next Next commit
Update scikit learn dependency
  • Loading branch information
@hlinsen
hlinsen committed Jun 2, 2020
commit 6a82825549ab80a321b3ef950178b851cc0d363c
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ conda install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge -c defaul
distributed>=2.12.0 \
dask-cudf=${MINOR_VERSION} \
dask-cuda=${MINOR_VERSION} \
scikit-learn>=0.21 \
scikit-learn>=0.23.1 \
nccl>=2.5 \
ucx-py=${MINOR_VERSION} \
libcypher-parser \
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda10.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- boost
- cython>=0.29,<0.30
- pytest
- scikit-learn>=0.21
- scikit-learn>=0.23.1
- sphinx
- sphinx_rtd_theme
- sphinxcontrib-websupport
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- boost
- cython>=0.29,<0.30
- pytest
- scikit-learn>=0.21
- scikit-learn>=0.23.1
- sphinx
- sphinx_rtd_theme
- sphinxcontrib-websupport
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- boost
- cython>=0.29,<0.30
- pytest
- scikit-learn>=0.21
- scikit-learn>=0.23.1
- sphinx
- sphinx_rtd_theme
- sphinxcontrib-websupport
Expand Down