diff --git a/.travis.yml b/.travis.yml index 7a98fc3..444decf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,32 @@ dist: trusty -sudo: false +sudo: required language: cpp addons: apt: sources: - ubuntu-toolchain-r-test - george-edison55-precise-backports + - sourceline: 'ppa:maarten-fonville/protobuf' packages: - gcc-7 - g++-7 - cmake-data - cmake - libopencv-dev + - libprotobuf-dev + - protobuf-compiler - python cache: directories: - - $HOME/protoc - $HOME/mkl-dnn install: - if [ "$CXX" = "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi - - sh .travis/install_protoc.sh - sh .travis/install_mkldnn.sh - mkdir -p data - pip install --user chainer - python retrieve_data.py - python gen_test_data.py before_script: - - ls -R $HOME/protoc - ls -R $HOME/mkl-dnn script: - mkdir build diff --git a/.travis/install_protoc.sh b/.travis/install_protoc.sh deleted file mode 100644 index 006b8d2..0000000 --- a/.travis/install_protoc.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env sh -if [ ! -d "$HOME/protoc/bin" ]; then - wget https://github.com/google/protobuf/archive/v2.6.1.tar.gz -O protobuf.tar.gz - tar -xzvf protobuf.tar.gz - mv protobuf-2.6.1 protobuf - cd protobuf - patch -u autogen.sh < ../.travis/autogen.patch - ./autogen.sh - ./configure --prefix=$HOME/protoc - make && make install - cd .. -else - echo "Using cached directory." -fi diff --git a/.travis/run_cmake.sh b/.travis/run_cmake.sh index 3c7563a..cf33e94 100644 --- a/.travis/run_cmake.sh +++ b/.travis/run_cmake.sh @@ -1,9 +1,5 @@ cmake \ -DENABLE_TEST=ON \ - -DProtobuf_PROTOC_EXECUTABLE="$HOME/protoc/bin/protoc" \ - -DProtobuf_INCLUDE_DIR="$HOME/protoc/include" \ - -DProtobuf_LIBRARY="$HOME/protoc/lib/libprotobuf.so" \ - -DProtobuf_PROTOC_LIBRARY="$HOME/protoc/lib/libprotoc.so" \ -DMKLDNN_INCLUDE_DIR="$HOME/mkl-dnn/include" \ -DMKLDNN_LIBRARY="$HOME/mkl-dnn/lib/libmkldnn.so" \ ..