12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update travis.yml to install tbb during install phase, source script to add variables to current shell

release/4.3a0
Varun Agrawal 2020-03-27 10:53:22 -04:00
parent 5dc19e0746
commit 99e1c42282
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.sh
View File

@ -3,12 +3,12 @@
# install TBB with _debug.so files # install TBB with _debug.so files
function install_tbb() function install_tbb()
{ {
TBBROOT=/tmp/tbb44_20151115oss
if [ "$(uname -s)" == "Linux" ]; then if [ "$(uname -s)" == "Linux" ]; then
wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz -O /tmp/tbb442.tgz wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz -O /tmp/tbb442.tgz
tar -C /tmp -xf /tmp/tbb442.tgz tar -C /tmp -xf /tmp/tbb442.tgz
TBBROOT=/tmp/tbb44_20151115oss
TBB_TARGET_ARCH="intel64" TBB_TARGET_ARCH="intel64"
library_directory="${TBB_TARGET_ARCH}/gcc4.1" library_directory="${TBB_TARGET_ARCH}/gcc4.1"
@ -22,14 +22,12 @@ function install_tbb()
wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz -O /tmp/tbb442.tgz wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz -O /tmp/tbb442.tgz
tar -C /tmp -xf /tmp/tbb442.tgz tar -C /tmp -xf /tmp/tbb442.tgz
TBBROOT=/tmp/tbb44_20151115oss
# Set library paths # Set library paths
export LIBRARY_PATH="${TBBROOT}/lib:$LIBRARY_PATH" export LIBRARY_PATH="${TBBROOT}/lib:$LIBRARY_PATH"
export DYLD_LIBRARY_PATH="${TBBROOT}/lib:$DYLD_LIBRARY_PATH" export DYLD_LIBRARY_PATH="${TBBROOT}/lib:$DYLD_LIBRARY_PATH"
fi fi
# CPATH="${TBBROOT}/include:$CPATH"; export CPATH CPATH="${TBBROOT}/include:$CPATH"; export CPATH
} }
# common tasks before either build or test # common tasks before either build or test

4
.travis.yml
View File

@ -17,13 +17,13 @@ addons:
- libpython-dev python-numpy - libpython-dev python-numpy
- libboost-all-dev - libboost-all-dev
before_install: # before_install:
- ./.travis.sh -tbb
# - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
install: install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
- source .travis.sh -tbb
# We first do the compile stage specified below, then the matrix expansion specified after. # We first do the compile stage specified below, then the matrix expansion specified after.
stages: stages: