From 0f18861a05647475548e4a2fe499f71efc7c89aa Mon Sep 17 00:00:00 2001
From: Olli-Pekka Heinisuo <op.heinisuo@gmail.com>
Date: Mon, 6 Mar 2017 18:55:17 +0200
Subject: [PATCH] testing how fast the build is with ninja

---
 .travis.yml            | 320 ++++++++++++++++++++---------------------
 travis/build-wheels.sh |  23 +--
 2 files changed, 173 insertions(+), 170 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9478ad0..cd1bf9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,116 +28,116 @@ matrix:
     - python: 3.5
   include:
 
-    # default builds for MacOS
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=0
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - ENABLE_CONTRIB=0
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=0
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=0
+    # # default builds for MacOS
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - ENABLE_CONTRIB=0
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - ENABLE_CONTRIB=0
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - ENABLE_CONTRIB=0
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=0
 
-    # Contrib builds for MacOS
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=1
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - ENABLE_CONTRIB=1
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=1
-    - os: osx
-      language: generic
-      osx_image: xcode8.2
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=1
+    # # Contrib builds for MacOS
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - ENABLE_CONTRIB=1
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - ENABLE_CONTRIB=1
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - ENABLE_CONTRIB=1
+    # - os: osx
+    #   language: generic
+    #   osx_image: xcode8.2
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=1
 
-    # default builds for Linux
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=0
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
+    # # default builds for Linux
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - UNICODE_WIDTH=16
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - UNICODE_WIDTH=16
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=0
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
 
     # contrib builds for Linux
     - os: linux
@@ -145,58 +145,58 @@ matrix:
         - MB_PYTHON_VERSION=2.7
         - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
         - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - ENABLE_CONTRIB=1
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - UNICODE_WIDTH=16
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=2.7
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - UNICODE_WIDTH=16
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.4
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.5
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    #     - ENABLE_CONTRIB=1
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=1
 
 before_install:
     - echo $ENABLE_CONTRIB > contrib.enabled
diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh
index 24ef63c..1b1e41e 100755
--- a/travis/build-wheels.sh
+++ b/travis/build-wheels.sh
@@ -8,6 +8,9 @@ echo 'PYTHON_VERSION: '$PYTHON_VERSION
 
 ENABLE_CONTRIB=$(<contrib.enabled)
 
+wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip -O ninja.zip; unzip ninja.zip; rm ninja.zip
+export PATH=$PATH:$(pwd)
+
 for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
     echo 'PWD  : '$PWD
     echo 'PYBIN: '$PYBIN
@@ -20,8 +23,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
     mkdir build
     if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
       echo 'Config for Py2'
-      cmake28 -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
-        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF \
+      cmake28 -H"." -B"build" -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
+        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
         -DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
         -DPYTHON2_EXECUTABLE=$PYBIN/python \
         -DPYTHON2_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \
@@ -33,8 +36,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
 
     if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
       echo 'Config for Py3'
-      cmake28 -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
-        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF \
+      cmake28 -H"." -B"build" -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
+        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
         -DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
         -DPYTHON3_EXECUTABLE=$PYBIN/python \
         -DPYTHON3_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \
@@ -46,8 +49,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
 
     if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
       echo 'Config for Py2'
-      cmake28 -H"." -B"build" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
-        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF \
+      cmake28 -H"." -B"build" -GNinja -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
+        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
         -DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
         -DPYTHON2_EXECUTABLE=$PYBIN/python \
         -DPYTHON2_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \
@@ -59,8 +62,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
 
     if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
       echo 'Config for Py3'
-      cmake28 -H"." -B"build" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
-        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF \
+      cmake28 -H"." -B"build" -GNinja -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
+        -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
         -DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
         -DPYTHON3_EXECUTABLE=$PYBIN/python \
         -DPYTHON3_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \
@@ -72,12 +75,12 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
 
     if [[ $PYTHON_VERSION == 2* ]]; then
       echo 'Build for Py2'
-      (cd build; make -j2 opencv_python2)
+      (cd build; ninja)
     fi
 
     if [[ $PYTHON_VERSION == 3* ]]; then
       echo 'Build for Py3'
-      (cd build; make -j2 opencv_python3)
+      (cd build; ninja)
     fi
 
 
-- 
GitLab