Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Richard 祝发兴 - -IT
opencv-python
提交
0f18861a
O
opencv-python
项目概览
Richard 祝发兴 - -IT
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0f18861a
编写于
3月 06, 2017
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
testing how fast the build is with ninja
上级
1fa9ac0f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
173 addition
and
170 deletion
+173
-170
.travis.yml
.travis.yml
+160
-160
travis/build-wheels.sh
travis/build-wheels.sh
+13
-10
未找到文件。
.travis.yml
浏览文件 @
0f18861a
...
...
@@ -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
...
...
travis/build-wheels.sh
浏览文件 @
0f18861a
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录