travis fixes

.travis.yml

@@ -20,25 +20,25 @@ 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: 
+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)
@@ -50,17 +50,17 @@ before_script:
 - 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
+- ${INSTALL_PREFIX}/bin/luarocks install totem
+- if [[ $TORCH_LUA_VERSION != 'LUAJIT21' && $TORCH_LUA_VERSION != 'LUAJIT20' ]]; then ${INSTALL_PREFIX}/bin/luarocks install luaffi; fi
 - cd $ROOT_TRAVIS_DIR
 - export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$LD_LIBRARY_PATH
-script: 
+script:
 - ${INSTALL_PREFIX}/bin/luarocks make
 - export PATH=${INSTALL_PREFIX}/bin:$PATH
 - export LD_LIBRARY_PATH=$HOME/GraphViz/lib:$LD_LIBRARY_PATH
 - export TESTLUA=$(which luajit lua | head -n 1)
 - ${TESTLUA} -lnngraph -e "print('nngraph loaded succesfully')"
-- ${INSTALL_PREFIX}/bin/luarocks install totem
 - cd test
 - ${TESTLUA} test_ModuleFromCriterion.lua
 - ${TESTLUA} test_nest.lua
 - ${TESTLUA} test_nngraph.lua
-