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] Add cudatoolkit dependency #264

Merged
merged 2 commits into from
May 2, 2019
Merged

[REVIEW] Add cudatoolkit dependency #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd5b6b
ENH Add cudatoolkit dependency
raydouglass May 2, 2019
95b5db9
DOC Update changelog
raydouglass May 2, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- PR #233 Added csv datasets and edited test to use cudf for reading graphs
- PR #247 Added some documentation for renumbering
- PR #252 cpp test upgrades for more convenient testing on large input
- PR #264 Add cudatoolkit conda dependency

## Bug Fixes
- PR #256 Add pip to the install, clean up conda instructions
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ Install and update cuGraph using the conda command:

```bash
# CUDA 9.2
conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph
conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=9.2

# CUDA 10.0
conda install -c nvidia/label/cuda10.0 -c rapidsai/label/cuda10.0 -c numba -c conda-forge -c defaults cugraph
conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=10.0
```

Note: This conda installation only applies to Linux and Python versions 3.6/3.7.
Expand Down
9 changes: 1 addition & 8 deletions ci/cpu/libcugraph/upload-anaconda.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,7 @@ if [ "$UPLOAD_LIBCUGRAPH" == "1" ]; then

SOURCE_BRANCH=master

if [ "$LABEL_MAIN" == "1" ]; then
LABEL_OPTION="--label main --label cuda${CUDA_REL}"
elif [ "$LABEL_MAIN" == "0" ]; then
LABEL_OPTION="--label dev --label cuda${CUDA_REL}"
else
echo "Unknown label configuration LABEL_MAIN='$LABEL_MAIN'"
exit 1
fi
LABEL_OPTION="--label main --label cuda${CUDA_REL}"
echo "LABEL_OPTION=${LABEL_OPTION}"

test -e ${UPLOADFILE}
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- networkx
- python-louvain
- nccl
- cudatoolkit
- cudatoolkit=9.2
- cmake>=3.12
- python>=3.6,<3.8
- numba>=0.41
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- networkx
- python-louvain
- nccl
- cudatoolkit
- cudatoolkit=10.0
- cmake>=3.12
- python>=3.6,<3.8
- numba>=0.41
Expand Down
4 changes: 3 additions & 1 deletion conda/recipes/libcugraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# conda build -c nvidia -c rapidsai -c conda-forge -c defaults .
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
{% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %}
{% set cuda_version='.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %}
package:
name: libcugraph
version: {{ version }}
Expand All @@ -29,11 +29,13 @@ requirements:
- networkx
- cython
- nvgraph
- cudatoolkit {{ cuda_version }}.*
run:
- libcudf=0.7*
- networkx
- cython
- nvgraph
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

#test:
# commands:
Expand Down