[CI] Fix cuDF install; merge 'gpu' and 'cudf' test suite (#5814)

dmlc · Jun 19, 2020 · a6d9a06 · a6d9a06
1 parent a67bc64
commit a6d9a06
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 68 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -323,25 +323,12 @@ def TestPythonGPU(args) {
       sh """
       ${dockerRun} ${container_type} ${docker_binary} ${docker_args} tests/ci_build/test_python.sh mgpu
       """
-      if (args.cuda_version != '9.0') {
-        echo "Running tests with cuDF..."
-        sh """
-        ${dockerRun} cudf ${docker_binary} ${docker_args} tests/ci_build/test_python.sh mgpu-cudf
-        """
-      }
     } else {
       echo "Using a single GPU"
       sh """
       ${dockerRun} ${container_type} ${docker_binary} ${docker_args} tests/ci_build/test_python.sh gpu
       """
-      if (args.cuda_version != '9.0') {
-        echo "Running tests with cuDF..."
-        sh """
-        ${dockerRun} cudf ${docker_binary} ${docker_args} tests/ci_build/test_python.sh cudf
-        """
-      }
     }
-    // For CUDA 10.0 target, run cuDF tests too
     deleteDir()
   }
 }

diff --git a/tests/ci_build/Dockerfile.cudf b/tests/ci_build/Dockerfile.cudf
diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu
@@ -3,6 +3,7 @@ FROM nvidia/cuda:$CUDA_VERSION-runtime-ubuntu16.04
 
 # Environment
 ENV DEBIAN_FRONTEND noninteractive
+SHELL ["/bin/bash", "-c"]   # Use Bash as shell
 
 # Install all basic requirements
 RUN \
@@ -14,11 +15,11 @@ RUN \
 
 ENV PATH=/opt/python/bin:$PATH
 
-# Install Python packages
+# Create new Conda environment with cuDF, Dask, and cuPy
 RUN \
     conda create -n gpu_test -c rapidsai -c nvidia -c conda-forge -c defaults \
-        python=3.7 dask dask-cuda numpy pytest scipy  scikit-learn pandas \
-        matplotlib wheel python-kubernetes urllib3 graphviz hypothesis
+        python=3.7 cudf=0.14 cudatoolkit=$CUDA_VERSION dask dask-cuda dask-cudf cupy \
+        numpy pytest scipy scikit-learn pandas matplotlib wheel python-kubernetes urllib3 graphviz hypothesis
 
 ENV GOSU_VERSION 1.10
 

diff --git a/tests/ci_build/test_python.sh b/tests/ci_build/test_python.sh
@@ -44,20 +44,6 @@ case "$suite" in
     cd -
     ;;
 
-  cudf)
-    source activate cudf_test
-    install_xgboost
-    pytest -v -s -rxXs --fulltrace -m "not mgpu" \
-           tests/python-gpu/test_from_cudf.py tests/python-gpu/test_from_cupy.py \
-	   tests/python-gpu/test_gpu_prediction.py
-    ;;
-
-  mgpu-cudf)
-    source activate cudf_test
-    install_xgboost
-    pytest -v -s -rxXs --fulltrace -m "mgpu" tests/python-gpu/test_gpu_with_dask.py
-    ;;
-
   cpu)
     install_xgboost
     pytest -v -s --fulltrace tests/python
@@ -66,7 +52,7 @@ case "$suite" in
     ;;
 
   *)
-    echo "Usage: $0 {gpu|mgpu|cudf|cpu}"
+    echo "Usage: $0 {gpu|mgpu|cpu}"
     exit 1
     ;;
 esac