diff --git a/CHANGELOG.md b/CHANGELOG.md index 796ab38eb..666a57525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - PR #603 Always test both legacy and per-thread default stream - PR #611 Add a note to the contribution guide about requiring 2 C++ reviewers - PR #615 Improve gpuCI Scripts +- PR #627 Cleanup gpuCI Scripts - PR #635 Add Python docs build to gpuCI ## Bug Fixes diff --git a/build.sh b/build.sh index b6700433c..463d4e0b9 100755 --- a/build.sh +++ b/build.sh @@ -48,7 +48,7 @@ RAN_CMAKE=0 # If INSTALL_PREFIX is not set, check PREFIX, then check # CONDA_PREFIX, then fall back to install inside of $LIBRMM_BUILD_DIR INSTALL_PREFIX=${INSTALL_PREFIX:=${PREFIX:=${CONDA_PREFIX:=$LIBRMM_BUILD_DIR/install}}} -PARALLEL_LEVEL=${PARALLEL_LEVEL:=""} +export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4} function hasArg { (( NUMARGS != 0 )) && (echo " ${ARGS} " | grep -q " $1 ") diff --git a/ci/checks/changelog.sh b/ci/checks/changelog.sh index 2530472db..2cb0edbac 100755 --- a/ci/checks/changelog.sh +++ b/ci/checks/changelog.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2020, NVIDIA CORPORATION. ######################### # RMM CHANGELOG Tester # ######################### diff --git a/ci/checks/style.sh b/ci/checks/style.sh index 001afeb6f..754c6ccfc 100644 --- a/ci/checks/style.sh +++ b/ci/checks/style.sh @@ -1,17 +1,18 @@ #!/bin/bash -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2020, NVIDIA CORPORATION. ##################### # RMM Style Tester # ##################### # Ignore errors and set path set +e -PATH=/conda/bin:$PATH +PATH=/opt/conda/bin:$PATH LC_ALL=C.UTF-8 LANG=C.UTF-8 # Activate common conda env -source activate gdf +. /opt/conda/etc/profile.d/conda.sh +conda activate rapids # Run isort and get results/return code ISORT=`isort --recursive --check-only python` diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 8ff09c1d3..6dc2204aa 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2020, NVIDIA CORPORATION. ###################################### # rmm CPU build script for CI # ###################################### @@ -37,8 +37,8 @@ conda activate rapids gpuci_logger "Check versions" python --version -gcc --version -g++ --version +$CC --version +$CXX --version gpuci_logger "Check conda environment" conda info @@ -55,19 +55,21 @@ conda config --set ssl_verify False if [[ "$BUILD_LIBRMM" == "1" ]]; then gpuci_logger "Build conda pkg for librmm" if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then - conda build conda/recipes/librmm --python=$PYTHON + gpuci_conda_retry build conda/recipes/librmm --python=$PYTHON else - conda build --dirty --no-remove-work-dir conda/recipes/librmm + gpuci_conda_retry build --dirty --no-remove-work-dir conda/recipes/librmm fi fi if [[ "$BUILD_RMM" == "1" ]]; then gpuci_logger "Build conda pkg for rmm" if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then - conda build conda/recipes/rmm --python=$PYTHON + gpuci_conda_retry build conda/recipes/rmm --python=$PYTHON else + gpuci_conda_retry build --dirty --no-remove-work-dir conda/recipes/rmm conda build --dirty --no-remove-work-dir \ -c $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ conda/recipes/rmm + fi fi diff --git a/ci/docs/build.sh b/ci/docs/build.sh index e3343e5f2..d2dad2e6c 100644 --- a/ci/docs/build.sh +++ b/ci/docs/build.sh @@ -11,7 +11,7 @@ if [ -z "$PROJECT_WORKSPACE" ]; then fi export DOCS_WORKSPACE=$WORKSPACE/docs -export PATH=/conda/bin:/usr/local/cuda/bin:$PATH +export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH export HOME=$WORKSPACE export PROJECT_WORKSPACE=/rapids/rmm export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 02f7845e4..0c9bc1b98 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2020, NVIDIA CORPORATION. ###################################### # rmm GPU build & testscript for CI # ###################################### @@ -42,7 +42,7 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -# gpuci_conda_retry remove -f rapids-build-env +# conda remove -f rapids-build-env # gpuci_conda_retry install "your-pkg=1.0.0" gpuci_logger "Check versions" @@ -107,7 +107,7 @@ else cd $WORKSPACE/python gpuci_logger "Installing librmm" - conda install -c $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ librmm + gpuci_conda_retry install -c $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ librmm export LIBRMM_BUILD_DIR="$WORKSPACE/ci/artifacts/rmm/cpu/conda_work/build" gpuci_logger "Building rmm" diff --git a/ci/local/README.md b/ci/local/README.md index aafcf7790..e37268f04 100644 --- a/ci/local/README.md +++ b/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/rmm -s -$ source activate rapids # Activate gpuCI conda environment +$ . /opt/conda/etc/profile.d/conda.sh +$ conda activate rapids # Activate gpuCI conda environment $ cd rapids $ flake8 python ```