Skip to content
This repository has been archived by the owner on Feb 27, 2021. It is now read-only.

[REVIEW] Add cudatoolkit dependency #275

Merged
merged 3 commits into from
May 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Version jump from 0.3->0.7 is to align with other RAPIDS projects.
- PR #221 Create separate conda packages for libnvstrings and nvstrings
- PR #247 Release Python GIl while calling underlying C++ API from python
- PR #240 Initial suite of nvtext function Python unit tests
- PR #275 Add cudatoolkit conda dependency

## Bug Fixes

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ cuStrings can be installed with conda ([miniconda](https://conda.io/miniconda.ht
```bash
# for CUDA 9.2
conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults \
nvstrings=0.4 python=3.6
nvstrings=0.4 python=3.6 cudatoolkit=9.2

# or, for CUDA 10.0
conda install -c nvidia/label/cuda10.0 -c rapidsai/label/cuda10.0 -c numba \
-c conda-forge -c defaults nvstrings=0.4 python=3.6
conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults \
nvstrings=0.4 python=3.6 cudatoolkit=10.0
```

We also provide [nightly conda packages](https://anaconda.org/rapidsai-nightly) built from the tip of our latest development branch.
Expand Down
1 change: 1 addition & 0 deletions conda/environments/builddocs_py36.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ dependencies:
- ipython
- recommonmark
- pandoc=<2.0.0
- cudatoolkit=9.2
- pip:
- sphinx-markdown-tables
5 changes: 4 additions & 1 deletion conda/recipes/libcustrings/meta.yaml
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: libnvstrings
version: {{ version }}
Expand All @@ -26,6 +26,9 @@ requirements:
- cmake >=3.12
host:
- librmm 0.7.*
- cudatoolkit {{ cuda_version }}.*
run:
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

test:
commands:
Expand Down