Merge pull request #1225 from rapidsai/branch-0.6

[gpuCI] Auto-merge branch-0.6 to branch-0.7 [skip ci]

CHANGELOG.md

@@ -160,6 +160,7 @@
 - PR #1184 Fix iloc performance regression
 - PR #1185 Support left_on/right_on and also on=str in merge
 - PR #1200 Fix allocating bitmasks with numba instead of rmm in allocate_mask function
+- PR #1223 gpuCI: Fix label on rapidsai channel on gpu build scripts
 
 
 # cuDF 0.5.1 (05 Feb 2019)

ci/gpu/build.sh

@@ -13,6 +13,7 @@ function logger() {
 # Set path and build parallel level
 export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
 export PARALLEL_LEVEL=4
+export CUDA_REL=${CUDA_VERSION%.*}
 
 # Set home to the job's workspace
 export HOME=$WORKSPACE
@@ -29,6 +30,7 @@ nvidia-smi
 
 logger "Activate conda env..."
 source activate gdf
+conda install -c rapidsai/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} nvstrings=0.3*
 
 logger "Check versions..."
 python --version
@@ -40,15 +42,6 @@ conda list
 # BUILD - Build libcudf and cuDF from source
 ################################################################################
 
-# Temporarily update nvstrings for testing
-CUDA_REL=${CUDA_VERSION:0:3}
-if [ "${CUDA_VERSION:0:2}" == '10' ]; then
-  # CUDA 10 release
-  CUDA_REL=${CUDA_VERSION:0:4}
-fi
-logger "conda install -c rapidsai -c rapidsai-nightly/label/cuda${CUDA_REL} nvstrings=0.3*"
-conda install -c rapidsai -c rapidsai-nightly/label/cuda${CUDA_REL} nvstrings=0.3*
-
 logger "Build libcudf..."
 mkdir -p $WORKSPACE/cpp/build
 cd $WORKSPACE/cpp/build