travis: uwlcm tests: boost from package, link to proper boost python

Author: pdziekan

.travis.yml

@@ -89,12 +89,12 @@ jobs:
         env: TEST_SUITE=pbl MPI=mvapich2
       - <<: *precache_default
         env: TEST_SUITE=bconds_div MPI=mvapich2
-      - <<: *precache_default
-        env: TEST_SUITE=UWLCM_MT MPI=none
-      - <<: *precache_default
-        env: TEST_SUITE=UWLCM_unit_iles MPI=none
-      - <<: *precache_default
-        env: TEST_SUITE=UWLCM_unit_smg MPI=none
+#      - <<: *precache_default
+#        env: TEST_SUITE=UWLCM_MT MPI=none
+#      - <<: *precache_default
+#        env: TEST_SUITE=UWLCM_unit_iles MPI=none
+#      - <<: *precache_default
+#        env: TEST_SUITE=UWLCM_unit_smg MPI=none
 
     # excluded jobs
     exclude:

.travis_scripts/deps_install/install_common.sh

@@ -69,41 +69,42 @@ if [[ $MPI != 'none'    ]]; then export CC=${DEPS_DIR}/mvapich2-2.3b/bin/mpicc ;
 # no MPI
 if [[ $TRAVIS_OS_NAME == 'linux' && $MPI == 'none' ]]; then 
   # not UWLCM test - get boost from the repository
-  if [[ $TEST_SUITE != 'UWLCM_MT' && $TEST_SUITE != 'UWLCM_unit_iles' && $TEST_SUITE != 'UWLCM_unit_smg' ]]; then
-    sudo $apt_get_install boost1.61
+ # if [[ $TEST_SUITE != 'UWLCM_MT' && $TEST_SUITE != 'UWLCM_unit_iles' && $TEST_SUITE != 'UWLCM_unit_smg' ]]; then
+  sudo $apt_get_install boost1.61
+  sudo ln -s /usr/lib/x86_64-linux-gnu/libboost_python-py35.so /usr/lib/x86_64-linux-gnu/libboost_python3.so # different naming conventions for boost python with python 3
   # UWLCM test without MPI - we need boost.python3 >=1.63(?) for libcloud bindings
-  else 
-    ls -A ${DEPS_DIR}/boost
-    if [[ -z "$(ls -A ${DEPS_DIR}/boost)" ]]; then
-      wget http://sourceforge.net/projects/boost/files/boost/1.65.1/boost_1_65_1.tar.gz 
-      tar xf boost_1_65_1.tar.gz
-      cd boost_1_65_1
-      # configure and install
-      if [[ $COMPILER == 'g++' ]]; then echo "using gcc : 6.2 : g++-6 ;" > $HOME/user-config.jam; fi
-      if [[ $COMPILER == 'clang++' ]]; then echo "using clang : 5.0 : clang++-5.0 ;" > $HOME/user-config.jam; fi
-      echo "using python : 3.5 : /opt/pyenv/shims/python3 ;" >> $HOME/user-config.jam
-      cat $HOME/user-config.jam
-      if [[ $COMPILER == 'g++' ]]; then
-        ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=thread,date_time,system,iostreams,timer,filesystem,program_options,python
-        ./b2 -d0 install
-      fi
-      if [[ $COMPILER == 'clang++' ]]; then 
-        #clang installation taken from https://gist.github.com/jimporter/10442880
-        ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=thread,date_time,system,iostreams,timer,filesystem,program_options,python --with-toolset=clang
-        ./b2 clean
-        ./b2 toolset=clang cxxflags="-std=c++14 -stdlib=libc++" linkflags="-stdlib=libc++" --prefix=${DEPS_DIR}/boost/ -j 4 stage release
-        ./b2 install toolset=clang cxxflags="-std=c++14 -stdlib=libc++" linkflags="-stdlib=libc++" --prefix=${DEPS_DIR}/boost/
-      fi
-      cd ..
-    else
-      echo "Using cached boost."
-    fi
-    export BOOST_ROOT=${DEPS_DIR}/boost
-    export LD_LIBRARY_PATH=${DEPS_DIR}/boost/lib:${LD_LIBRARY_PATH}
-    export LD_RUN_PATH=${DEPS_DIR}/boost/lib:${LD_RUN_PATH}
-    export LIBRARY_PATH=${DEPS_DIR}/boost/lib:${LIBRARY_PATH}
-    export CPATH=${DEPS_DIR}/boost/include:${CPATH}
-  fi
+ # else 
+ #   ls -A ${DEPS_DIR}/boost
+ #   if [[ -z "$(ls -A ${DEPS_DIR}/boost)" ]]; then
+ #     wget http://sourceforge.net/projects/boost/files/boost/1.65.1/boost_1_65_1.tar.gz 
+ #     tar xf boost_1_65_1.tar.gz
+ #     cd boost_1_65_1
+ #     # configure and install
+ #     if [[ $COMPILER == 'g++' ]]; then echo "using gcc : 6.2 : g++-6 ;" > $HOME/user-config.jam; fi
+ #     if [[ $COMPILER == 'clang++' ]]; then echo "using clang : 5.0 : clang++-5.0 ;" > $HOME/user-config.jam; fi
+ #     echo "using python : 3.5 : /opt/pyenv/shims/python3 ;" >> $HOME/user-config.jam
+ #     cat $HOME/user-config.jam
+ #     if [[ $COMPILER == 'g++' ]]; then
+ #       ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=thread,date_time,system,iostreams,timer,filesystem,program_options,python
+ #       ./b2 -d0 install
+ #     fi
+ #     if [[ $COMPILER == 'clang++' ]]; then 
+ #       #clang installation taken from https://gist.github.com/jimporter/10442880
+ #       ./bootstrap.sh --prefix=${DEPS_DIR}/boost/ --with-libraries=thread,date_time,system,iostreams,timer,filesystem,program_options,python --with-toolset=clang
+ #       ./b2 clean
+ #       ./b2 toolset=clang cxxflags="-std=c++14 -stdlib=libc++" linkflags="-stdlib=libc++" --prefix=${DEPS_DIR}/boost/ -j 4 stage release
+ #       ./b2 install toolset=clang cxxflags="-std=c++14 -stdlib=libc++" linkflags="-stdlib=libc++" --prefix=${DEPS_DIR}/boost/
+ #     fi
+ #     cd ..
+ #   else
+ #     echo "Using cached boost."
+ #   fi
+ #   export BOOST_ROOT=${DEPS_DIR}/boost
+ #   export LD_LIBRARY_PATH=${DEPS_DIR}/boost/lib:${LD_LIBRARY_PATH}
+ #   export LD_RUN_PATH=${DEPS_DIR}/boost/lib:${LD_RUN_PATH}
+ #   export LIBRARY_PATH=${DEPS_DIR}/boost/lib:${LIBRARY_PATH}
+ #   export CPATH=${DEPS_DIR}/boost/include:${CPATH}
+ # fi
 fi
 
 # for MPI we need boost>=1.59 with mpi support, boost installation based on https://github.com/boostorg/compute/blob/master/.travis.yml