Correct .travis.sh
							parent
							
								
									96169665b0
								
							
						
					
					
						commit
						a5b722d237
					
				|  | @ -6,6 +6,11 @@ if [ -z ${PYTHON_VERSION+x} ]; then | |||
|     exit 127 | ||||
| fi | ||||
| 
 | ||||
| if [ -z ${WRAPPER+x} ]; then | ||||
|     echo "Please provide the wrapper to build!" | ||||
|     exit 126 | ||||
| fi | ||||
| 
 | ||||
| PYTHON="python${PYTHON_VERSION}" | ||||
| 
 | ||||
| if [[ $(uname) == "Darwin" ]]; then | ||||
|  | @ -15,9 +20,29 @@ else | |||
|     sudo apt-get install wget libicu-dev python3-pip python3-setuptools | ||||
| fi | ||||
| 
 | ||||
| CURRDIR=$(pwd) | ||||
| PATH=$PATH:$($PYTHON -c "import site; print(site.USER_BASE)")/bin | ||||
| 
 | ||||
| sudo $PYTHON -m pip install -r ./cython/requirements.txt | ||||
| case $WRAPPER in | ||||
| "cython") | ||||
|     BUILD_CYTHON="ON" | ||||
|     BUILD_PYBIND="OFF" | ||||
|     TYPEDEF_POINTS_TO_VECTORS="OFF" | ||||
| 
 | ||||
|     $PYTHON -m pip install --user -r ./cython/requirements.txt | ||||
|     ;; | ||||
| "pybind") | ||||
|     BUILD_CYTHON="OFF" | ||||
|     BUILD_PYBIND="ON" | ||||
|     TYPEDEF_POINTS_TO_VECTORS="ON" | ||||
| 
 | ||||
|     $PYTHON -m pip install --user -r ./wrap/python/requirements.txt | ||||
|     ;; | ||||
| *) | ||||
|     exit 126 | ||||
|     ;; | ||||
| esac | ||||
| 
 | ||||
| CURRDIR=$(pwd) | ||||
| 
 | ||||
| mkdir $CURRDIR/build | ||||
| cd $CURRDIR/build | ||||
|  | @ -27,17 +52,30 @@ cmake $CURRDIR -DCMAKE_BUILD_TYPE=Release \ | |||
|     -DGTSAM_USE_QUATERNIONS=OFF \ | ||||
|     -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \ | ||||
|     -DGTSAM_BUILD_WITH_MARCH_NATIVE=OFF \ | ||||
|     -DGTSAM_INSTALL_CYTHON_TOOLBOX=ON \ | ||||
|     -DGTSAM_INSTALL_CYTHON_TOOLBOX=${BUILD_CYTHON} \ | ||||
|     -DGTSAM_BUILD_PYTHON=${BUILD_PYBIND} \ | ||||
|     -DGTSAM_TYPEDEF_POINTS_TO_VECTORS=${TYPEDEF_POINTS_TO_VECTORS} \ | ||||
|     -DGTSAM_PYTHON_VERSION=$PYTHON_VERSION \ | ||||
|     -DGTSAM_ALLOW_DEPRECATED_SINCE_V41=OFF \ | ||||
|     -DGTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF \ | ||||
|     -DPYTHON_EXECUTABLE:FILEPATH=$(which $PYTHON) \ | ||||
|     -DCMAKE_INSTALL_PREFIX=$CURRDIR/../gtsam_install | ||||
| 
 | ||||
| make -j$(nproc) install | ||||
| 
 | ||||
| cd cython | ||||
| 
 | ||||
| sudo $PYTHON setup.py install | ||||
| 
 | ||||
| cd $CURRDIR/cython/gtsam/tests | ||||
| 
 | ||||
| $PYTHON -m unittest discover | ||||
| case $WRAPPER in | ||||
| "cython") | ||||
|     cd $CURRDIR/../gtsam_install/cython | ||||
|     $PYTHON setup.py install --user --prefix= | ||||
|     cd $CURRDIR/cython/gtsam/tests | ||||
|     $PYTHON -m unittest discover | ||||
|     ;; | ||||
| "pybind") | ||||
|     $PYTHON setup.py install --user --prefix= | ||||
|     cd $CURRDIR/wrap/python/gtsam_py/tests | ||||
|     $PYTHON -m unittest discover | ||||
|     ;; | ||||
| *) | ||||
|     echo "THIS SHOULD NEVER HAPPEN!" | ||||
|     exit 125 | ||||
|     ;; | ||||
| esac | ||||
|  |  | |||
							
								
								
									
										16
									
								
								.travis.sh
								
								
								
								
							
							
						
						
									
										16
									
								
								.travis.sh
								
								
								
								
							|  | @ -4,17 +4,17 @@ | |||
| function install_tbb() | ||||
| { | ||||
|   TBB_BASEURL=https://github.com/oneapi-src/oneTBB/releases/download | ||||
|   TBB_VERSION=4.4.2 | ||||
|   TBB_DIR=tbb44_20151115oss | ||||
|   TBB_VERSION=4.4.5 | ||||
|   TBB_DIR=tbb44_20160526oss | ||||
|   TBB_SAVEPATH="/tmp/tbb.tgz" | ||||
| 
 | ||||
|   if [ "$TRAVIS_OS_NAME" == "linux" ]; then | ||||
|   if [ "$(uname)" == "Linux" ]; then | ||||
|     OS_SHORT="lin" | ||||
|     TBB_LIB_DIR="intel64/gcc4.4" | ||||
|     SUDO="sudo" | ||||
| 
 | ||||
|   elif [ "$TRAVIS_OS_NAME" == "osx" ]; then | ||||
|     OS_SHORT="lin" | ||||
|   elif [ "$(uname)" == "Darwin" ]; then | ||||
|     OS_SHORT="osx" | ||||
|     TBB_LIB_DIR="" | ||||
|     SUDO="" | ||||
| 
 | ||||
|  | @ -46,7 +46,7 @@ function configure() | |||
|   rm -fr $BUILD_DIR || true | ||||
|   mkdir $BUILD_DIR && cd $BUILD_DIR | ||||
| 
 | ||||
|   install_tbb | ||||
|   [ "${GTSAM_WITH_TBB:-OFF}" = "ON" ] && install_tbb | ||||
| 
 | ||||
|   if [ ! -z "$GCC_VERSION" ]; then | ||||
|     export CC=gcc-$GCC_VERSION | ||||
|  | @ -61,9 +61,9 @@ function configure() | |||
|       -DGTSAM_WITH_TBB=${GTSAM_WITH_TBB:-OFF} \ | ||||
|       -DGTSAM_USE_QUATERNIONS=${GTSAM_USE_QUATERNIONS:-OFF} \ | ||||
|       -DGTSAM_BUILD_EXAMPLES_ALWAYS=${GTSAM_BUILD_EXAMPLES_ALWAYS:-ON} \ | ||||
|       -DGTSAM_ALLOW_DEPRECATED_SINCE_V4=${GTSAM_ALLOW_DEPRECATED_SINCE_V41:-OFF} \ | ||||
|       -DGTSAM_ALLOW_DEPRECATED_SINCE_V4=${GTSAM_ALLOW_DEPRECATED_SINCE_V4:-OFF} \ | ||||
|       -DGTSAM_BUILD_WITH_MARCH_NATIVE=OFF \ | ||||
|       -DCMAKE_VERBOSE_MAKEFILE=OFF | ||||
|       -DCMAKE_VERBOSE_MAKEFILE=ON | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue