Merge pull request #7 from raymondxyang/pypi_test

Update CMAKE install scripts in Travis; Update commit info to build ONNX 1.2.1

Author: linkerzhang

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
     - REPO_DIR=onnx
-    - BUILD_COMMIT=2f85783fc43576b5e39b207f95d5f789641ae706
+    - BUILD_COMMIT=c7b60050ad6ae963bf2cc1d0eb3c32b07eb7eeed
     - PLAT=x86_64
     - PB_VERSION=2.6.1
     - UNICODE_WIDTH=32

appveyor.yml

@@ -39,7 +39,7 @@ environment:
 
 install:
 - cmd: set repo_dir=onnx
-- cmd: set build_commit=2f85783fc43576b5e39b207f95d5f789641ae706
+- cmd: set build_commit=c7b60050ad6ae963bf2cc1d0eb3c32b07eb7eeed
 - cmd: git submodule update --init --recursive
 - cmd: cd %repo_dir%
 - cmd: git fetch origin

config.sh

@@ -20,7 +20,7 @@ function build_libs {
         PB_VERSION=2.6.1
         mkdir -p "$pb_dir"
         curl -L -O https://github.com/google/protobuf/releases/download/v${PB_VERSION}/protobuf-${PB_VERSION}.tar.gz
-        tar -xzvf protobuf-${PB_VERSION}.tar.gz -C "$pb_dir" --strip-components 1
+        tar -xzf protobuf-${PB_VERSION}.tar.gz -C "$pb_dir" --strip-components 1
         activate_ccache
         ccache -z
         cd ${pb_dir} && ./configure && make -j${NUMCORES} && make check && make install && ldconfig 2>&1 || true
@@ -32,7 +32,23 @@ function build_libs {
         echo PATH: $PATH
         pip install pytest-runner
     fi
+
+    cd ${wkdir_path}
+
+    if [ -z "$IS_OSX" ]; then
+       cmake_dir="${wkdir_path}/cmake"
+       mkdir -p "$cmake_dir"
+       curl -L -O https://cmake.org/files/v3.1/cmake-3.1.2.tar.gz
+       tar -xzf cmake-3.1.2.tar.gz -C "$cmake_dir" --strip-components 1
+       cd ${cmake_dir} && ls ${cmake_dir}
+       ./configure --prefix=${cmake_dir}/build
+       make -j${NUMCORES} && make install
+       ${cmake_dir}/build/bin/cmake -version
+       export PATH="${cmake_dir}/build/bin:$PATH"
+    fi
+
     cd ${wkdir_path}
+    pip install protobuf numpy
 }
 
 function run_tests {