Gpuciscripts clean and update

CHANGELOG.md

@@ -13,14 +13,16 @@
 - PR #101: MST core solver
 - PR #93: Incorporate Date/Nagi implementation of Hungarian Algorithm
 - PR #94: Allow generic reductions for the map then reduce op
-- RP #95: Cholesky rank one update prim
+- PR #95: Cholesky rank one update prim
 
 ## Improvements
 - PR #108: Remove unused old-gpubuild.sh
 - PR #73: Move DistanceType enum from cuML to RAFT
+- pr #92: Cleanup gpuCI scripts
 - PR #98: Adding InnerProduct to DistanceType
 - PR #103: Epsilon parameter for Cholesky rank one update
 - PR #100: Add divyegala as codeowner
+- PR #111: Cleanup gpuCI scripts
 
 ## Bug Fixes
 - PR #106: Specify dependency branches to avoid pip resolver failure

ci/checks/style.sh

@@ -6,10 +6,11 @@
 
 # Ignore errors and set path
 set +e
-PATH=/conda/bin:$PATH
+PATH=/opt/conda/bin:$PATH
 
 # Activate common conda env
-source activate gdf
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 
 # Run flake8 and get results/return code
 FLAKE=`flake8 --exclude=cpp,thirdparty,__init__.py,versioneer.py && flake8 --config=python/.flake8.cython`

ci/gpu/build.sh

@@ -8,19 +8,14 @@ set -e
 NUMARGS=$#
 ARGS=$*
 
-# Logger function for build status output
-function logger() {
-  echo -e "\n>>>> $@\n"
-}
-
 # Arg parsing function
 function hasArg {
     (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ")
 }
 
 # Set path and build parallel level
-export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
-export PARALLEL_LEVEL=4
+export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
+export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
 export CUDA_REL=${CUDA_VERSION%.*}
 
 # Set home to the job's workspace
@@ -38,18 +33,19 @@ source $WORKSPACE/ci/prtest.config
 # SETUP - Check environment
 ################################################################################
 
-logger "Check environment..."
+gpuci_logger "Check environment"
 env
 
-logger "Check GPU usage..."
+gpuci_logger "Check GPU usage"
 nvidia-smi
 
-# temporary usage of conda install with packages listed here, looking into
+# temporary usage of gpuci_conda_retry install with packages listed here, looking into
 # using the repos yaml files for this
-logger "Activate conda env..."
-source activate gdf
-logger "Installing packages needed for RAFT..."
-conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
+gpuci_logger "Activate conda env"
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
+gpuci_logger "Installing packages needed for RAFT"
+gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
       "cupy>=7,<8.0.0a0" \
       "cudatoolkit=${CUDA_REL}" \
       "cudf=${MINOR_VERSION}" \
@@ -63,31 +59,34 @@ conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
       "ucx-py=${MINOR_VERSION}"
 
 # Install the master version of dask, distributed, and dask-ml
-logger "pip install git+https://github.com/dask/distributed.git@master --upgrade --no-deps"
-pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps
-logger "pip install git+https://github.com/dask/dask.git@master --upgrade --no-deps"
-pip install "git+https://github.com/dask/dask.git@master" --upgrade --no-deps
+gpuci_logger "pip install git+https://github.com/dask/distributed.git --upgrade --no-deps"
+pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
+gpuci_logger "pip install git+https://github.com/dask/dask.git --upgrade --no-deps"
+pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps
 
 
-logger "Check versions..."
+gpuci_logger "Check versions"
 python --version
 $CC --version
 $CXX --version
-conda list
+conda info
+conda config --show-sources
+conda list --show-channel-urls
+
 
 ################################################################################
 # BUILD - Build RAFT tests
 ################################################################################
 
-logger "Adding ${CONDA_PREFIX}/lib to LD_LIBRARY_PATH"
+gpuci_logger "Adding ${CONDA_PREFIX}/lib to LD_LIBRARY_PATH"
 
 export LD_LIBRARY_PATH_CACHED=$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
 
-logger "Build C++ and Python targets..."
+gpuci_logger "Build C++ and Python targets"
 $WORKSPACE/build.sh cppraft pyraft -v
 
-logger "Resetting LD_LIBRARY_PATH..."
+gpuci_logger "Resetting LD_LIBRARY_PATH"
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_CACHED
 export LD_LIBRARY_PATH_CACHED=""
@@ -99,18 +98,18 @@ export LD_LIBRARY_PATH_CACHED=""
 ################################################################################
 
 if hasArg --skip-tests; then
-    logger "Skipping Tests..."
+    gpuci_logger "Skipping Tests"
     exit 0
 fi
 
-logger "Check GPU usage..."
+gpuci_logger "Check GPU usage"
 nvidia-smi
 
-logger "GoogleTest for raft..."
+gpuci_logger "GoogleTest for raft"
 cd $WORKSPACE/cpp/build
 GTEST_OUTPUT="xml:${WORKSPACE}/test-results/raft_cpp/" ./test_raft
 
-logger "Python pytest for cuml..."
+gpuci_logger "Python pytest for cuml"
 cd $WORKSPACE/python
 
 python -m pytest --cache-clear --junitxml=${WORKSPACE}/junit-cuml.xml -v -s

ci/local/README.md

@@ -30,7 +30,8 @@ For a full list of available gpuCI docker images, visit our [DockerHub](https://
 Style Check:
 ```bash
 $ bash ci/local/build.sh -r ~/rapids/cuml -s
-$ source activate gdf    #Activate gpuCI conda environment
+$ . /opt/conda/etc/profile.d/conda.sh
+$ conda activate rapids    #Activate gpuCI conda environment
 $ cd rapids
 $ flake8 python
 ```

ci/local/old-gpubuild.sh

@@ -0,0 +1,205 @@
+#!/bin/bash
+# Copyright (c) 2020, NVIDIA CORPORATION.
+#########################################
+# cuML GPU build and test script for CI #
+#########################################
+
+set -e
+NUMARGS=$#
+ARGS=$*
+
+# Arg parsing function
+function hasArg {
+    (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ")
+}
+
+# Set path and build parallel level
+export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
+export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
+export CUDA_REL=${CUDA_VERSION%.*}
+
+# Set home to the job's workspace
+export HOME=$WORKSPACE
+
+# Parse git describei
+cd $WORKSPACE
+export GIT_DESCRIBE_TAG=`git describe --tags`
+export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
+
+# Read options for cloning/running downstream repo tests
+source $WORKSPACE/ci/prtest.config
+
+################################################################################
+# SETUP - Check environment
+################################################################################
+
+gpuci_logger "Check environment"
+env
+
+gpuci_logger "Check GPU usage"
+nvidia-smi
+
+# temporary usage of gpuci_conda_retry install with packages listed here, looking into
+# using the repos yaml files for this
+gpuci_logger "Activate conda env"
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
+gpuci_logger "Installing packages needed for RAFT"
+gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
+      "cupy>=7,<8.0.0a0" \
+      "cudatoolkit=${CUDA_REL}" \
+      "cudf=${MINOR_VERSION}" \
+      "rmm=${MINOR_VERSION}" \
+      "cmake==3.14.3" \
+      "nccl>=2.5" \
+      "dask>=2.12.0" \
+      "distributed>=2.12.0" \
+      "dask-cudf=${MINOR_VERSION}" \
+      "dask-cuda=${MINOR_VERSION}" \
+      "ucx-py=${MINOR_VERSION}"
+
+if [ "$RUN_CUML_LIBCUML_TESTS" = "ON" ] || [ "$RUN_CUML_PRIMS_TESTS" = "ON" ] || [ "$RUN_CUML_PYTHON_TESTS" = "ON" ]; then
+  gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \
+      "nvstrings=${MINOR_VERSION}" \
+      "libcumlprims=${MINOR_VERSION}" \
+      "lapack" \
+      "umap-learn" \
+      "nccl>=2.5" \
+      "statsmodels" \
+      "xgboost====1.0.2dev.rapidsai0.13" \
+      "lightgbm"
+fi
+
+if [ "$RUN_CUGRAPH_LIBCUGRAPH_TESTS" = "ON" ] || [ "$RUN_CUGRAPH_PYTHON_TESTS" = "ON" ]; then
+  gpuci_conda_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge -c defaults \
+      "networkx>=2.3" \
+      "python-louvain" \
+      "libcypher-parser" \
+      "ipython=7.3*" \
+      "jupyterlab"
+fi
+
+# Install the master version of dask, distributed, and dask-ml
+gpuci_logger "pip install git+https://github.com/dask/distributed.git --upgrade --no-deps"
+pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
+gpuci_logger "pip install git+https://github.com/dask/dask.git --upgrade --no-deps"
+pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps
+
+
+gpuci_logger "Check versions"
+python --version
+$CC --version
+$CXX --version
+conda info
+conda config --show-sources
+conda list --show-channel-urls
+
+
+################################################################################
+# BUILD - Build RAFT tests
+################################################################################
+
+gpuci_logger "Adding ${CONDA_PREFIX}/lib to LD_LIBRARY_PATH"
+
+export LD_LIBRARY_PATH_CACHED=$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
+
+gpuci_logger "Build libcuml, cuml, prims and bench targets"
+$WORKSPACE/build.sh cppraft pyraft -v
+
+gpuci_logger "Resetting LD_LIBRARY_PATH"
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_CACHED
+export LD_LIBRARY_PATH_CACHED=""
+
+gpuci_logger "Build treelite for GPU testing"
+
+cd $WORKSPACE
+
+
+################################################################################
+# TEST - Run GoogleTest and py.tests for RAFT
+################################################################################
+
+if hasArg --skip-tests; then
+    gpuci_logger "Skipping Tests"
+    exit 0
+fi
+
+gpuci_logger "Check GPU usage"
+nvidia-smi
+
+gpuci_logger "GoogleTest for raft"
+cd $WORKSPACE/cpp/build
+GTEST_OUTPUT="xml:${WORKSPACE}/test-results/raft_cpp/" ./test/ml
+
+gpuci_logger "Python pytest for cuml"
+cd $WORKSPACE/python
+
+pytest --cache-clear --junitxml=${WORKSPACE}/junit-cuml.xml -v -s
+
+
+################################################################################
+# cuML CI
+################################################################################
+
+if [ "$RUN_CUML_LIBCUML_TESTS" = "ON" ] || [ "$RUN_CUML_PRIMS_TESTS" = "ON" ] || [ "$RUN_CUML_PYTHON_TESTS" = "ON" ] || [ "$RUN_CUGRAPH_LIBCUGRAPH_TESTS" = "ON" ] || [ "$RUN_CUGRAPH_PYTHON_TESTS" = "ON" ]; then
+  cd $WORKSPACE
+  mkdir $WORKSPACE/test_downstream_repos
+  cd $WORKSPACE/test_downstream_repos
+  export RAFT_PATH=$WORKSPACE
+fi
+
+if [ "$RUN_CUML_LIBCUML_TESTS" = "ON" ] || [ "$RUN_CUML_PRIMS_TESTS" = "ON" ] || [ "$RUN_CUML_PYTHON_TESTS" = "ON" ]; then
+  cd $WORKSPACE/test_downstream_repos
+
+  ## Change fork and branch to be tested here:
+  git clone https://github.com/rapidsai/cuml.git -b branch-0.14
+
+
+  ## Build cuML and run tests, uncomment the tests you want to run
+  $WORKSPACE/test_downstream_repos/cuml/build.sh
+
+  if [ "$RUN_CUML_LIBCUML_TESTS" = "ON" ]; then
+    gpuci_logger "GoogleTest for libcuml"
+    cd $WORKSPACE/cpp/build
+    GTEST_OUTPUT="xml:${WORKSPACE}/test-results/libcuml_cpp/" ./test/ml
+  fi
+
+  if [ "$RUN_CUML_PYTHON_TESTS" = "ON" ]; then
+    gpuci_logger "Python pytest for cuml"
+    cd $WORKSPACE/python
+    pytest --cache-clear --junitxml=${WORKSPACE}/junit-cuml.xml -v -s -m "not memleak"
+  fi
+
+  if [ "$RUN_CUML_PRIMS_TESTS" = "ON" ]; then
+    gpuci_logger "Run ml-prims test"
+    cd $WORKSPACE/cpp/build
+    GTEST_OUTPUT="xml:${WORKSPACE}/test-results/prims/" ./test/prims
+  fi
+fi
+
+
+################################################################################
+# cuGraph CI
+################################################################################
+
+if [ "$RUN_CUGRAPH_LIBCUGRAPH_TESTS" = "ON" ] || [ "$RUN_CUGRAPH_PYTHON_TESTS" = "ON" ]; then
+  cd $WORKSPACE/test_downstream_repos
+
+  ## Change fork and branch to be tested here:
+  git clone https://github.com/rapidsai/cugraph.git -b branch-0.14
+
+  $WORKSPACE/test_downstream_repos/cugraph/build.sh clean libcugraph cugraph
+
+  if [ "$RUN_CUGRAPH_LIBCUGRAPH_TESTS" = "ON" ]; then
+    gpuci_logger "GoogleTest for libcugraph"
+    cd $WORKSPACE/cpp/build
+    ${WORKSPACE}/ci/test.sh ${TEST_MODE_FLAG} | tee testoutput.txt
+  fi
+
+  if [ "$RUN_CUGRAPH_PYTHON_TESTS" = "ON" ]; then
+    gpuci_logger "Python pytest for cugraph"
+    cd $WORKSPACE/python
+  fi
+fi