diff options
| author | Soumith Chintala <soumith@gmail.com> | 2015-11-24 00:00:50 +0300 |
|---|---|---|
| committer | Soumith Chintala <soumith@gmail.com> | 2015-11-24 00:00:50 +0300 |
| commit | 5d82d23dbb25d42efdc049776afa50816c981404 (patch) | |
| tree | ccf6efb1c9f693bc1b0edb659d34ad1fb10bfd27 | |
| parent | e050c679a2c9c2bd81eab57e5ae7904f6be198a3 (diff) | |
| parent | a5869f64c10f00fb1a4e04cc2babfc8aa99d3ad8 (diff) | |
Merge pull request #40 from colesbury/travis
Fix travis build for Lua 5.1 and Lua 5.2
| -rw-r--r-- | .travis.yml | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index eb1384d..14d54b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,37 +19,36 @@ addons: - gfortran-multilib - liblapack-dev - build-essential - - gcc - - g++ + - gcc + - g++ - curl - - cmake - - libreadline-dev - - git-core - - libqt4-core + - cmake + - libreadline-dev + - git-core + - libqt4-core - libqt4-gui - - libqt4-dev - - libjpeg-dev - - libpng-dev + - libqt4-dev + - libjpeg-dev + - libpng-dev - ncurses-dev - - imagemagick - - libzmq3-dev - - gfortran - - unzip + - imagemagick + - libzmq3-dev + - gfortran + - unzip - gnuplot - - gnuplot-x11 -before_script: + - gnuplot-x11 +before_script: - export ROOT_TRAVIS_DIR=$(pwd) - export INSTALL_PREFIX=~/torch/install -- ls $HOME/OpenBlasInstall/lib || (cd /tmp/ && git clone https://github.com/xianyi/OpenBLAS.git -b master && cd OpenBLAS && (make NO_AFFINITY=1 -j$(getconf _NPROCESSORS_ONLN) 2>/dev/null >/dev/null) && make PREFIX=$HOME/OpenBlasInstall install) - git clone https://github.com/torch/distro.git ~/torch --recursive - cd ~/torch && git submodule update --init --recursive - mkdir build && cd build -- export CMAKE_LIBRARY_PATH=$HOME/OpenBlasInstall/include:$HOME/OpenBlasInstall/lib:$CMAKE_LIBRARY_PATH - cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" -DCMAKE_BUILD_TYPE=Release -DWITH_${TORCH_LUA_VERSION}=ON - make && make install - cd $ROOT_TRAVIS_DIR - export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$LD_LIBRARY_PATH -script: +- if [[ ! "$TORCH_LUA_VERSION" =~ "LUAJIT" ]]; then ${INSTALL_PREFIX}/bin/luarocks install luaffi; fi +script: - ${INSTALL_PREFIX}/bin/luarocks make rocks/threads-scm-1.rockspec - export PATH=${INSTALL_PREFIX}/bin:$PATH - export TESTLUA=$(which luajit lua | head -n 1) |