From 3e006f0bbe6beb4f35af69ddcd71fc495fd4559f Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Mon, 16 Jan 2017 17:40:16 +0800 Subject: [PATCH 1/5] opencv_contrib --- .gitmodules | 3 +++ opencv_contrib | 1 + 2 files changed, 4 insertions(+) create mode 160000 opencv_contrib diff --git a/.gitmodules b/.gitmodules index 5f4b374c..5072a3f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "multibuild"] path = multibuild url = https://github.com/matthew-brett/multibuild.git +[submodule "opencv_contrib"] + path = opencv_contrib + url = https://github.com/opencv/opencv_contrib.git diff --git a/opencv_contrib b/opencv_contrib new file mode 160000 index 00000000..86342522 --- /dev/null +++ b/opencv_contrib @@ -0,0 +1 @@ +Subproject commit 86342522b0eb2b16fa851c020cc4e0fef4e010b7 From 7f89999a9106570cefefa13f8689e113f1b5971a Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Mon, 16 Jan 2017 21:04:38 +0800 Subject: [PATCH 2/5] [README] add opencv_contrib note --- README.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index dcbef97f..afb7b2cf 100644 --- a/README.rst +++ b/README.rst @@ -11,9 +11,9 @@ OpenCV on wheels **Unofficial** OpenCV packages for Python. -This repository generates packages which contain pre-compiled OpenCV binary with Python bindings. This enables super fast (usually < 10 seconds) OpenCV installation for Python. +This repository generates packages which contain pre-compiled OpenCV binary with Python bindings. This enables super fast (usually < 10 seconds) OpenCV installation for Python. -If you need only OpenCV Python bindings, no separate OpenCV installation is required. +If you need only OpenCV Python bindings, no separate OpenCV installation is required. **IMPORTANT NOTE** @@ -122,6 +122,12 @@ build artifacts use local version identifiers: These artifacts can't be and will not be uploaded to PyPI. +To build ``opencv_contrib``:: + + cd build + cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv + + Manylinux wheels ---------------- From 099e7a8e0aa0dda937c7851b44558c8147b6a5ea Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Mon, 16 Jan 2017 23:46:36 +0800 Subject: [PATCH 3/5] [try] window build --- README.rst | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index afb7b2cf..37b9ce17 100644 --- a/README.rst +++ b/README.rst @@ -125,7 +125,7 @@ These artifacts can't be and will not be uploaded to PyPI. To build ``opencv_contrib``:: cd build - cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv + cmake -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv Manylinux wheels diff --git a/appveyor.yml b/appveyor.yml index 0c2d3cca..96c91a09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ build_script: cd opencv - if %PYTHON_VERSION% GEQ 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE="%PYTHON%/python.exe" -DPYTHON3_LIBRARY="%PYTHON%/libs/python3*.lib" -DPYTHON3_INCLUDE_DIR="%PYTHON%/include" -Wno-dev + if %PYTHON_VERSION% GEQ 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE="%PYTHON%/python.exe" -DPYTHON3_LIBRARY="%PYTHON%/libs/python3*.lib" -DPYTHON3_INCLUDE_DIR="%PYTHON%/include" -Wno-dev -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules if %PYTHON_VERSION% LSS 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -Wno-dev cd %BUILD_DIR% From 706adbe5563e1139c1ddc23d0b07f931e18ceca7 Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Mon, 16 Jan 2017 23:49:43 +0800 Subject: [PATCH 4/5] appveyor: disable py2 and py34 build --- appveyor.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 96c91a09..2f20bc11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,22 +6,22 @@ environment: secure: HHNjmjxQSvgSY9Zde0qh6A== matrix: - - PYTHON: "C:/Python27" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "2.7" - - PYTHON: "C:/Python27-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "2.7" - - PYTHON: "C:/Python34" - BUILD_ENV: "Visual Studio 14" - BUILD_DIR: "build" - PYTHON_VERSION: "3.4" - - PYTHON: "C:/Python34-x64" - BUILD_ENV: "Visual Studio 14 Win64" - BUILD_DIR: "build64" - PYTHON_VERSION: "3.4" + # - PYTHON: "C:/Python27" + # BUILD_ENV: "Visual Studio 14" + # BUILD_DIR: "build" + # PYTHON_VERSION: "2.7" + # - PYTHON: "C:/Python27-x64" + # BUILD_ENV: "Visual Studio 14 Win64" + # BUILD_DIR: "build64" + # PYTHON_VERSION: "2.7" + # - PYTHON: "C:/Python34" + # BUILD_ENV: "Visual Studio 14" + # BUILD_DIR: "build" + # PYTHON_VERSION: "3.4" + # - PYTHON: "C:/Python34-x64" + # BUILD_ENV: "Visual Studio 14 Win64" + # BUILD_DIR: "build64" + # PYTHON_VERSION: "3.4" - PYTHON: "C:/Python35" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" From 355cef2ae11426200894c3bbf77a765c5004c12a Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Tue, 17 Jan 2017 11:14:01 +0800 Subject: [PATCH 5/5] enable testing and shared lib --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2f20bc11..e84503f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,8 +57,8 @@ build_script: cd opencv - if %PYTHON_VERSION% GEQ 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE="%PYTHON%/python.exe" -DPYTHON3_LIBRARY="%PYTHON%/libs/python3*.lib" -DPYTHON3_INCLUDE_DIR="%PYTHON%/include" -Wno-dev -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules - if %PYTHON_VERSION% LSS 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -Wno-dev + if %PYTHON_VERSION% GEQ 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DPYTHON3_EXECUTABLE="%PYTHON%/python.exe" -DPYTHON3_LIBRARY="%PYTHON%/libs/python3*.lib" -DPYTHON3_INCLUDE_DIR="%PYTHON%/include" -Wno-dev -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules + if %PYTHON_VERSION% LSS 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -Wno-dev -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules cd %BUILD_DIR%