Skip to content

Commit

Permalink
ENH Drop unnecessary build env vars
Browse files Browse the repository at this point in the history
All are needed for cudf to be built, cleaning up for readability
  • Loading branch information
mike-wendt committed Oct 26, 2018
1 parent 3c95932 commit 0fadab2
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 64 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ env:

matrix:
include:
- env: CUDA=9.2.148_396.37 BUILD_CUDF=1 BUILD_LIBGDF=1 BUILD_CFFI=1 PYTHON=3.5
- env: CUDA=9.2.148_396.37 BUILD_CUDF=1 BUILD_LIBGDF=1 BUILD_CFFI=1 PYTHON=3.6
- env: CUDA=9.2.148_396.37 PYTHON=3.5
- env: CUDA=9.2.148_396.37 PYTHON=3.6

before_install:
# install build environment for libgdf
Expand Down
6 changes: 2 additions & 4 deletions travisci/build_cudf.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set -e

if [ "$BUILD_CUDF" == "1" ]; then
echo "Building cudf"
CUDF_BUILD_NO_GPU_TEST=1 conda build conda-recipes/cudf -c defaults -c conda-forge -c rapidsai/label/dev -c numba --python=$PYTHON
fi
echo "Building cudf"
CUDF_BUILD_NO_GPU_TEST=1 conda build conda-recipes/cudf -c defaults -c conda-forge -c rapidsai/label/dev -c numba --python=$PYTHON
6 changes: 2 additions & 4 deletions travisci/libgdf/build_libgdf.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set -e

if [ "$BUILD_LIBGDF" == "1" ]; then
echo "Building libgdf"
conda build conda-recipes/libgdf -c defaults -c conda-forge -c numba
fi
echo "Building libgdf"
conda build conda-recipes/libgdf -c defaults -c conda-forge -c numba
6 changes: 2 additions & 4 deletions travisci/libgdf/build_libgdf_cffi.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set -e

if [ "$BUILD_LIBGDF" == "1" -a "$BUILD_CFFI" == "1" ]; then
echo "Building libgdf_cffi"
conda build conda-recipes/libgdf_cffi -c defaults -c conda-forge -c numba --python=${PYTHON}
fi
echo "Building libgdf_cffi"
conda build conda-recipes/libgdf_cffi -c defaults -c conda-forge -c numba --python=${PYTHON}
48 changes: 23 additions & 25 deletions travisci/libgdf/install-env-libgdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,26 @@
# Copyright (c) 2018, NVIDIA CORPORATION.
set -e

if [ "$BUILD_LIBGDF" == "1" ]; then
# install libboost
sudo apt-get update -q
sudo apt-get install -y libboost-all-dev
# install libcuda
echo "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/ /" | sudo tee -a /etc/apt/sources.list.d/cuda.list
sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub
sudo apt-get update -q
sudo apt-get install -y --no-install-recommends cuda-drivers=396.44-1 libcuda1-396
# install gcc-5
echo "deb http://archive.ubuntu.com/ubuntu/ xenial main restricted" | sudo tee -a /etc/apt/sources.list
echo "deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted" | sudo tee -a /etc/apt/sources.list
echo "deb http://security.ubuntu.com/ubuntu/ xenial-security main restricted" | sudo tee -a /etc/apt/sources.list
sudo apt-get update -q
sudo apt-get install -y gcc-5 g++-5 cpp-5 libisl15 libmpfr4 libstdc++-5-dev libgcc-5-dev libc6-dev
# set gcc/g++ paths
export CC=/usr/bin/gcc-5
export CXX=/usr/bin/g++-5
# install cuda
source ./travisci/libgdf/install-cuda-trusty.sh
# check versions
$CC --version
$CXX --version
nvcc --version
fi
# install libboost
sudo apt-get update -q
sudo apt-get install -y libboost-all-dev
# install libcuda
echo "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/ /" | sudo tee -a /etc/apt/sources.list.d/cuda.list
sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub
sudo apt-get update -q
sudo apt-get install -y --no-install-recommends cuda-drivers=396.44-1 libcuda1-396
# install gcc-5
echo "deb http://archive.ubuntu.com/ubuntu/ xenial main restricted" | sudo tee -a /etc/apt/sources.list
echo "deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted" | sudo tee -a /etc/apt/sources.list
echo "deb http://security.ubuntu.com/ubuntu/ xenial-security main restricted" | sudo tee -a /etc/apt/sources.list
sudo apt-get update -q
sudo apt-get install -y gcc-5 g++-5 cpp-5 libisl15 libmpfr4 libstdc++-5-dev libgcc-5-dev libc6-dev
# set gcc/g++ paths
export CC=/usr/bin/gcc-5
export CXX=/usr/bin/g++-5
# install cuda
source ./travisci/libgdf/install-cuda-trusty.sh
# check versions
$CC --version
$CXX --version
nvcc --version
14 changes: 6 additions & 8 deletions travisci/libgdf/upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ function upload() {
source ./travisci/libgdf/upload-anaconda.sh
}

if [ "$BUILD_LIBGDF" == "1" ]; then
export UPLOADFILE=`conda build conda-recipes/libgdf -c defaults -c conda-forge --output`
upload
fi
# Upload libgdf
export UPLOADFILE=`conda build conda-recipes/libgdf -c defaults -c conda-forge --output`
upload

if [ "$BUILD_CFFI" == "1" ]; then
export UPLOADFILE=`conda build conda-recipes/libgdf_cffi -c defaults -c conda-forge --python=${PYTHON} --output`
upload
fi
# Upload libgdf_cffi
export UPLOADFILE=`conda build conda-recipes/libgdf_cffi -c defaults -c conda-forge --python=${PYTHON} --output`
upload
32 changes: 15 additions & 17 deletions travisci/upload-anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,22 @@

set -e

if [ "$BUILD_CUDF" == "1" ]; then
export UPLOADFILE=`conda build conda-recipes/cudf -c defaults -c conda-forge -c numba -c rapidsai/label/dev --python=$PYTHON --output`
SOURCE_BRANCH=master
export UPLOADFILE=`conda build conda-recipes/cudf -c defaults -c conda-forge -c numba -c rapidsai/label/dev --python=$PYTHON --output`
SOURCE_BRANCH=master

test -e ${UPLOADFILE}
test -e ${UPLOADFILE}

# Pull requests or commits to other branches shouldn't upload
#if [ ${TRAVIS_PULL_REQUEST} != false -o ${TRAVIS_BRANCH} != ${SOURCE_BRANCH} ]; then
# echo "Skipping upload"
# return 0
#fi
# Pull requests or commits to other branches shouldn't upload
#if [ ${TRAVIS_PULL_REQUEST} != false -o ${TRAVIS_BRANCH} != ${SOURCE_BRANCH} ]; then
# echo "Skipping upload"
# return 0
#fi

if [ -z "$MY_UPLOAD_KEY" ]; then
echo "No upload key"
return 0
fi

echo "Upload"
echo ${UPLOADFILE}
anaconda -t ${MY_UPLOAD_KEY} upload -u rapidsai -l dev --force ${UPLOADFILE}
if [ -z "$MY_UPLOAD_KEY" ]; then
echo "No upload key"
return 0
fi

echo "Upload"
echo ${UPLOADFILE}
anaconda -t ${MY_UPLOAD_KEY} upload -u rapidsai -l dev --force ${UPLOADFILE}

0 comments on commit 0fadab2

Please sign in to comment.