Merge pull request rapidsai#111 from okoskinen/streamline_cuda_rel

Streamline CUDA_REL environment variable
shwina · Aug 8, 2019 · 1c9e3b8 · 1c9e3b8
2 parents fc8b350 + 23983b5
commit 1c9e3b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 ## Improvements
 
-    ...
+- PR #111 Streamline CUDA_REL environment variable
 
 ## Bug Fixes
 

diff --git a/ci/cpu/librmm/build_librmm.sh b/ci/cpu/librmm/build_librmm.sh
@@ -2,11 +2,7 @@ set -e
 
 if [ "$BUILD_LIBRMM" == '1' ]; then
   echo "Building librmm"
-  CUDA_REL=${CUDA:0:3}
-  if [ "${CUDA:0:2}" == '10' ]; then
-    # CUDA 10 release
-    CUDA_REL=${CUDA:0:4}
-  fi
+  CUDA_REL=${CUDA_VERSION%.*}
 
   conda build conda/recipes/librmm -c nvidia/label/cuda${CUDA_REL} -c rapidsai/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c conda-forge --python=$PYTHON
 fi
diff --git a/ci/cpu/librmm/upload-anaconda.sh b/ci/cpu/librmm/upload-anaconda.sh
@@ -8,11 +8,7 @@ if [ "$BUILD_LIBRMM" == '1' ]; then
   export UPLOADFILE=`conda build conda/recipes/librmm -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge --python=$PYTHON --output`
 
   SOURCE_BRANCH=master
-  CUDA_REL=${CUDA:0:3}
-  if [ "${CUDA:0:2}" == '10' ]; then
-    # CUDA 10 release
-    CUDA_REL=${CUDA:0:4}
-  fi
+  CUDA_REL=${CUDA_VERSION%.*}
 
   SOURCE_BRANCH=master
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     ## Improvements
-        ...
+    - PR #111 Streamline CUDA_REL environment variable
     ## Bug Fixes
@@ Expand Down @@