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 dependencies #76

Merged
merged 3 commits into from
Apr 30, 2019
Merged

[REVIEW] Add cudatoolkit dependencies #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebd04b9
ENH Add cudatoolkit dependencies
raydouglass Apr 29, 2019
ab8b513
DOC Update changelog
raydouglass Apr 29, 2019
4b3924a
FIX Add cudatoolkit run dependency
raydouglass Apr 30, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

## Improvements

- PR #76 Add cudatoolkit conda dependency

## Bug Fixes

- PR #68 Fix signed/unsigned mismatch in random_allocate benchmark
Expand Down
9 changes: 1 addition & 8 deletions ci/cpu/librmm/upload-anaconda.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ if [ "$BUILD_LIBRMM" == '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}"

# Restrict uploads to master branch
Expand Down
10 changes: 1 addition & 9 deletions ci/cpu/rmm/upload-anaconda.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,7 @@ if [ "$BUILD_RMM" == "1" ]; then

SOURCE_BRANCH=master

# Have to label all CUDA versions due to the compatibility to work with any CUDA
if [ "$LABEL_MAIN" == "1" ]; then
LABEL_OPTION="--label main --label cuda9.2 --label cuda10.0"
elif [ "$LABEL_MAIN" == "0" ]; then
LABEL_OPTION="--label dev --label cuda9.2 --label cuda10.0"
else
echo "Unknown label configuration LABEL_MAIN='$LABEL_MAIN'"
exit 1
fi
LABEL_OPTION="--label main --label cuda9.2 --label cuda10.0"
echo "LABEL_OPTION=${LABEL_OPTION}"

test -e ${UPLOADFILE}
Expand Down
1 change: 1 addition & 0 deletions conda/environments/rmm_dev_cuda10.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dependencies:
- numba>=0.41
- cffi>=1.10.0
- pytest
- cudatoolkit=10.0
1 change: 1 addition & 0 deletions conda/environments/rmm_dev_cuda9.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dependencies:
- numba>=0.41
- cffi>=1.10.0
- pytest
- cudatoolkit=9.2
5 changes: 4 additions & 1 deletion conda/recipes/librmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% 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_VERSION', 'unknown').split('.')[:2]) %}
{% set cuda_version='.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %}
package:
name: librmm
version: {{ version }}
Expand All @@ -25,6 +25,9 @@ requirements:
build:
- cmake >=3.12.4
host:
- cudatoolkit {{ cuda_version }}.*
run:
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

test:
commands:
Expand Down