Fix Travis scripts

Author: vbkaisetsu

.travis.yml

@@ -40,16 +40,16 @@ matrix:
       language: python
       python: 3.5
       script:
-        - export PRIMITIV_PYTHON_BUILD_NUMBER="dev${TRAVIS_BUILD_NUMBER}";
+        - export PRIMITIV_PYTHON_BUILD_NUMBER="dev${TRAVIS_BUILD_NUMBER}"
         - pip install cython numpy scikit-build twine
         - wget "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2" -O eigen-downloaded.tar.gz
         - mkdir ./eigen-downloaded
         - tar xf ./eigen-downloaded.tar.gz --strip-components=1 -C ./eigen-downloaded
         - $TRAVIS_BUILD_DIR/setup.py sdist --bundle-core-library --bundle-eigen-headers ./eigen-downloaded
-        - pip3 install --user $TRAVIS_BUILD_DIR/dist/primitiv-*.tar.gz
+        - pip install $TRAVIS_BUILD_DIR/dist/primitiv-*.tar.gz
         - mkdir ./work
         - pushd ./work
-        - python3 -c 'import primitiv; dev = primitiv.devices.Eigen()'
+        - python -c "import primitiv; dev = primitiv.devices.Eigen()"
         - popd
       deploy:
         skip_cleanup: true
@@ -64,16 +64,16 @@ matrix:
       language: python
       python: 3.5
       script:
-        - export PRIMITIV_PYTHON_BUILD_NUMBER="${TRAVIS_BUILD_NUMBER}";
+        - export PRIMITIV_PYTHON_BUILD_NUMBER="${TRAVIS_BUILD_NUMBER}"
         - pip install cython numpy scikit-build twine
         - wget "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2" -O eigen-downloaded.tar.gz
         - mkdir ./eigen-downloaded
         - tar xf ./eigen-downloaded.tar.gz --strip-components=1 -C ./eigen-downloaded
         - $TRAVIS_BUILD_DIR/setup.py sdist --bundle-core-library --bundle-eigen-headers ./eigen-downloaded
-        - pip3 install --user $TRAVIS_BUILD_DIR/dist/primitiv-*.tar.gz
+        - pip install $TRAVIS_BUILD_DIR/dist/primitiv-*.tar.gz
         - mkdir ./work
         - pushd ./work
-        - python3 -c 'import primitiv; dev = primitiv.devices.Eigen()'
+        - python -c "import primitiv; dev = primitiv.devices.Eigen()"
         - popd
       deploy:
         skip_cleanup: true

.travis/debian.sh

@@ -7,9 +7,22 @@ docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/primitiv-python -td debian:sta
 
 # install
 docker exec travis-ci bash -c "apt update"
-docker exec travis-ci bash -c "apt install -y git build-essential cmake python3-dev python3-pip python3-numpy libeigen3-dev"
+docker exec travis-ci bash -c "apt install -y git build-essential cmake python3-dev python3-pip python3-numpy"
 docker exec travis-ci bash -c "pip3 install cython scikit-build"
 
+# TODO(vbkaisetsu):
+# Debian stretch contains Eigen 3.3.2. It has a bug around EIGEN_MPL2_ONLY
+# mode and SparseCholesky module. It is fixed in newer version.
+#
+# For more details, see: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1392
+
+# install Eigen
+docker exec travis-ci bash -c "apt install -y mercurial"
+docker exec travis-ci bash -c "hg clone https://bitbucket.org/eigen/eigen"
+docker exec travis-ci bash -c "mkdir ./eigen/build"
+docker exec travis-ci bash -c "cd ./eigen/build && cmake .."
+docker exec travis-ci bash -c "cd ./eigen/build && make && make install"
+
 # install OpenCL environment
 docker exec travis-ci bash -c "apt install -y opencl-headers libclblas-dev pkg-config libhwloc-dev libltdl-dev ocl-icd-dev ocl-icd-opencl-dev clang-3.8 llvm-3.8-dev libclang-3.8-dev libz-dev"
 # pocl 0.13 does not contain mem_fence() function that is used by primitiv.
@@ -28,16 +41,16 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py sdist --bundle-core-library"
 
     docker exec travis-ci bash -c "pip3 install /primitiv-python/dist/primitiv-*.tar.gz --verbose --global-option --enable-eigen --global-option --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 
     docker exec travis-ci bash -c "pip3 install --user /primitiv-python/dist/primitiv-*.tar.gz --verbose --global-option --enable-eigen --global-option --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 
     # test installing by "./setup.py install"
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py install --enable-eigen --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 else
     # install core library
@@ -52,7 +65,7 @@ else
 
     # test installing by "./setup.py install"
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py install --enable-eigen --enable-opencl --no-build-core-library"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 fi
 

.travis/ubuntu.sh

@@ -28,16 +28,16 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py sdist --bundle-core-library"
 
     docker exec travis-ci bash -c "pip3 install /primitiv-python/dist/primitiv-*.tar.gz --verbose --global-option --enable-eigen --global-option --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 
     docker exec travis-ci bash -c "pip3 install --user /primitiv-python/dist/primitiv-*.tar.gz --verbose --global-option --enable-eigen --global-option --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 
     # test installing by "./setup.py install"
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py install --enable-eigen --enable-opencl"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 else
     # install core library
@@ -52,7 +52,7 @@ else
 
     # test installing by "./setup.py install"
     docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py install --enable-eigen --enable-opencl --no-build-core-library"
-    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen(); dev = primitiv.devices.OpenCL()'"
+    docker exec travis-ci bash -c "python3 -c 'import primitiv; dev = primitiv.devices.Naive(); dev = primitiv.devices.Eigen()'"
     docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
 fi