Merge pull request #1525 from raydouglass/ci-cudatoolkit-dep

[WIP] Add cudatoolkit dependencies to conda packages for community compatibility

Author: raydouglass

CHANGELOG.md

@@ -61,12 +61,12 @@
 - PR #1484 Convert GroupBy CFFI to Cython
 - PR #1463 Allow and default melt keyword argument var_name to be None
 - PR #1486 Parquet Reader: Use device_buffer rather than device_ptr
+- PR #1525 Add cudatoolkit conda dependency
 - PR #1520 Renamed `src/dataframe` to `src/table` and moved `table.hpp`. Made `types.hpp` to be type declarations only.
 - PR #1521 Added `row_bitmask` to compute bitmask for rows of a table. Merged `valids_ops.cu` and `bitmask_ops.cu`
 - PR #1553 Overload `hash_row` to avoid using intial hash values. Updated `gdf_hash` to select between overloads
 - PR #1559 Add `except +` to all Cython function definitions to catch C++ exceptions properly
 
-
 ## Bug Fixes
 
 - PR #1233 Fix dtypes issue while adding the column to `str` dataframe.

README.md

@@ -49,11 +49,11 @@ cuDF can be installed with conda ([miniconda](https://conda.io/miniconda.html),
 ```bash
 # for CUDA 9.2
 conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults \
-    cudf=0.6 python=3.6
+    cudf=0.6 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 cudf=0.6 python=3.6
+conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults \
+    cudf=0.6 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.

ci/cpu/upload_anaconda.sh

@@ -27,14 +27,7 @@ if [ -z "$MY_UPLOAD_KEY" ]; then
 fi
 
 if [ "$UPLOAD_LIBCUDF" == "1" ]; then
-  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 ${LIBCUDF_FILE}
@@ -44,16 +37,7 @@ if [ "$UPLOAD_LIBCUDF" == "1" ]; then
 fi
 
 if [ "$UPLOAD_CUDF" == "1" ]; then
-
-  # 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 ${LIBCUDF_CFFI_FILE}

conda/environments/cudf_dev_cuda10.0.yml

@@ -25,5 +25,6 @@ dependencies:
 - numpydoc
 - ipython
 - recommonmark
+- cudatoolkit=10.0
 - pip:
   - sphinx-markdown-tables

conda/environments/cudf_dev_cuda9.2.yml

@@ -26,5 +26,6 @@ dependencies:
 - ipython
 - recommonmark
 - pandoc=<2.0.0
+- cudatoolkit=9.2
 - pip:
   - sphinx-markdown-tables

conda/recipes/libcudf/meta.yaml

@@ -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: libcudf
   version: {{ version }}
@@ -27,6 +27,9 @@ requirements:
   host:
     - librmm 0.7.*
     - libnvstrings 0.7.*
+    - cudatoolkit {{ cuda_version }}.*
+  run:
+    - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
 
 test:
   commands: