Skip to content

O
opencv-python

Richard 祝发兴 - -IT / opencv-python
与 Fork 源项目一致

Fork自 OpenCV / opencv-python

通知 1
Star 1
Fork 0
O
opencv-python

体验新版 GitCode，发现更多精彩内容 >>

提交 0f18861a 编写于 作者: O Olli-Pekka Heinisuo
浏览文件
操作

testing how fast the build is with ninja

上级 1fa9ac0f
隐藏空白更改
内联 并排
Showing with 173 addition and 170 deletion
.travis.yml
浏览文件 @ 0f18861a
...@@ -28,116 +28,116 @@ matrix: ...@@ -28,116 +28,116 @@ matrix:
- python: 3.5 - python: 3.5
include: include:
# default builds for MacOS # # default builds for MacOS
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
# Contrib builds for MacOS # # Contrib builds for MacOS
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: osx # - os: osx
language: generic # language: generic
osx_image: xcode8.2 # osx_image: xcode8.2
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
# default builds for Linux # # default builds for Linux
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- UNICODE_WIDTH=16 # - UNICODE_WIDTH=16
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- UNICODE_WIDTH=16 # - UNICODE_WIDTH=16
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=0 # - ENABLE_CONTRIB=0
# contrib builds for Linux # contrib builds for Linux
- os: linux - os: linux
...@@ -145,58 +145,58 @@ matrix: ...@@ -145,58 +145,58 @@ matrix:
- MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=1 - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- UNICODE_WIDTH=16 # - UNICODE_WIDTH=16
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=2.7 # - MB_PYTHON_VERSION=2.7
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- UNICODE_WIDTH=16 # - UNICODE_WIDTH=16
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.4 # - MB_PYTHON_VERSION=3.4
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.5 # - MB_PYTHON_VERSION=3.5
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
- os: linux # - os: linux
env: # env:
- MB_PYTHON_VERSION=3.6 # - MB_PYTHON_VERSION=3.6
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 # - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
- PLAT=i686 # - PLAT=i686
- ENABLE_CONTRIB=1 # - ENABLE_CONTRIB=1
before_install: before_install:
- echo $ENABLE_CONTRIB > contrib.enabled - echo $ENABLE_CONTRIB > contrib.enabled
......
travis/build-wheels.sh
浏览文件 @ 0f18861a
...@@ -8,6 +8,9 @@ echo 'PYTHON_VERSION: '$PYTHON_VERSION ...@@ -8,6 +8,9 @@ echo 'PYTHON_VERSION: '$PYTHON_VERSION
ENABLE_CONTRIB=$(<contrib.enabled) 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 for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
echo 'PWD : '$PWD echo 'PWD : '$PWD
echo 'PYBIN: '$PYBIN echo 'PYBIN: '$PYBIN
...@@ -20,8 +23,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do ...@@ -20,8 +23,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
mkdir build mkdir build
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
echo 'Config for Py2' echo 'Config for Py2'
cmake28 -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=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_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
-DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \ -DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
-DPYTHON2_EXECUTABLE=$PYBIN/python \ -DPYTHON2_EXECUTABLE=$PYBIN/python \
-DPYTHON2_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \ -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 ...@@ -33,8 +36,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
echo 'Config for Py3' echo 'Config for Py3'
cmake28 -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=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_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
-DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \ -DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
-DPYTHON3_EXECUTABLE=$PYBIN/python \ -DPYTHON3_EXECUTABLE=$PYBIN/python \
-DPYTHON3_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \ -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 ...@@ -46,8 +49,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
echo 'Config for Py2' 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 \ 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_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
-DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \ -DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
-DPYTHON2_EXECUTABLE=$PYBIN/python \ -DPYTHON2_EXECUTABLE=$PYBIN/python \
-DPYTHON2_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \ -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 ...@@ -59,8 +62,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
echo 'Config for Py3' 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 \ 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_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
-DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \ -DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
-DPYTHON3_EXECUTABLE=$PYBIN/python \ -DPYTHON3_EXECUTABLE=$PYBIN/python \
-DPYTHON3_VERSION_STRING=$($PYBIN/python -c "from platform import python_version; print python_version()") \ -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 ...@@ -72,12 +75,12 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
if [[ $PYTHON_VERSION == 2* ]]; then if [[ $PYTHON_VERSION == 2* ]]; then
echo 'Build for Py2' echo 'Build for Py2'
(cd build; make -j2 opencv_python2) (cd build; ninja)
fi fi
if [[ $PYTHON_VERSION == 3* ]]; then if [[ $PYTHON_VERSION == 3* ]]; then
echo 'Build for Py3' echo 'Build for Py3'
(cd build; make -j2 opencv_python3) (cd build; ninja)
fi fi
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或