Upgrade Travis build environment. (#812)

Upgrade Travis build environment.

.travis.yml

@@ -1,13 +1,14 @@
 sudo: required
-dist: xenial
+dist: bionic
 
 os:
   - linux
 
 language: python
 python:
-  - "2.7"
-  - "3.5"
+  - "3.6"
+virtualenv:
+  system_site_packages: true
 
 env:
   - TEST_PARSER=tensorflow TEST_ONNX=true
@@ -22,6 +23,7 @@ env:
   - TEST_PARSER=cntk TEST_ONNX=false
   - TEST_PARSER=caffe TEST_ONNX=true
   - TEST_PARSER=caffe TEST_ONNX=false
+  - TEST_PARSER=caffe_2 TEST_ONNX=true
   - TEST_PARSER=caffe_2 TEST_ONNX=false
   - TEST_PARSER=mxnet TEST_ONNX=true
   - TEST_PARSER=mxnet_2 TEST_ONNX=true
@@ -45,21 +47,20 @@ cache:
 
 addons:
   apt:
-    update: true
+    update: false
 
 before_install:
-  - sudo apt-get install -y openmpi-bin
-  - sudo apt-get install -y libprotobuf-dev libsnappy-dev libhdf5-serial-dev protobuf-compiler
-  - sudo apt-get install -y --no-install-recommends libboost-all-dev
-  - sudo apt-get install -y libatlas-base-dev
-  - sudo apt-get install -y libgflags-dev libgoogle-glog-dev
+  - sudo apt-get install -y --no-install-recommends caffe-cpu
+  - sudo apt-get install -y --no-install-recommends openmpi-bin
+  - sudo ln -s /usr/lib/x86_64-linux-gnu/libmpi_cxx.so.20 /usr/lib/x86_64-linux-gnu/libmpi_cxx.so.1
+  - sudo ln -s /usr/lib/x86_64-linux-gnu/libmpi.so.20 /usr/lib/x86_64-linux-gnu/libmpi.so.12
 
 install:
   - pip install -q -r $(python requirements/select_requirements.py)
-  - pip install wget
+  - pip install -q wget
 
 before_script:
-  - export LD_LIBRARY_PATH=$(python -c "import os; print(os.path.dirname(os.__file__) + '/site-packages/caffe/libs')"):${LD_LIBRARY_PATH}
+  - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu
 
 after_failure: true
 
@@ -77,9 +78,9 @@ matrix:
     - env: TEST_PARSER=paddle TEST_ONNX=false
 
   exclude:
-    - python: "3.5"
+    - python: "3.6"
       env: TEST_PARSER=paddle TEST_ONNX=true
-    - python: "3.5"
+    - python: "3.6"
       env: TEST_PARSER=paddle TEST_ONNX=false
     - os: linux
       env: TEST_PARSER=coreml TEST_ONNX=true

requirements/linux-py3.txt

@@ -8,8 +8,7 @@ keras==2.2.4
 coremltools==2.1.0
 mxnet==1.2.0
 cntk==2.6
-http://download.pytorch.org/whl/cpu/torch-0.4.0-cp35-cp35m-linux_x86_64.whl
-https://raw.githubusercontent.com/PaulaQin/pycaffe_packages/master/caffe-1.0-py3-none-any.whl
+http://download.pytorch.org/whl/cpu/torch-0.4.0-cp36-cp36m-linux_x86_64.whl
 torchvision==0.2.1
 onnx==1.4.1
 onnx-tf==1.2.1

setup.py

@@ -12,7 +12,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.2.4',
+    version='0.2.5',
 
     description='Deep learning model converter, visualization and editor.',
     long_description=long_description,
@@ -80,7 +80,7 @@ setup(
         'numpy >= 1.15.0',
         'protobuf >= 3.6.0',
         'six >= 1.10.0',
-        'pillow >= 3.1.0',
+        'pillow >= 6.2.1',
     ],
 
     # To provide executable scripts, use entry points in preference to the

test.sh

@@ -9,8 +9,8 @@ export BUILD_OUTPUT=$WORKDIR/build.out
 touch $BUILD_OUTPUT
 
 dump_output() {
-   echo Tailing the last 100 lines of output:
-   tail -100 $BUILD_OUTPUT
+   echo Tailing the last 500 lines of output:
+   tail -500 $BUILD_OUTPUT
 }
 error_handler() {
   echo ERROR: An error was encountered with the build.