gift-surg · dzhoshkun · Oct 28, 2018 · Oct 28, 2018 · Oct 28, 2018 · Oct 28, 2018
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ variables:
   CTEST_OUTPUT_ON_FAILURE: "1"
 
 before_script:
+  - export GiftGrab_REPO_DIR=$(pwd)
   - export REVHASH=$(git rev-parse --short HEAD)
   - export SCRATCH_DIR="$SCRATCH_DIR/$REVHASH"
   - mkdir -p $SCRATCH_DIR
@@ -12,12 +13,68 @@ before_script:
   - export TEST_LAUNCHER="${GiftGrab_SOURCE_DIR}/tests/run-tests.sh"
   - source "$CI_SCRIPTS_DIR/utils.sh"
   - export BOOST_163_ROOT_DIR="/home/gitlab-runner/environments/giftgrab/boost163"
+  # force use of CMake version 3.12.4 (issue #50)
+  - export CMAKE_3_12_4_PATH="/home/gitlab-runner/environments/giftgrab/install/cmake/cmake-3.12.4-Linux-x86_64/bin"
+  - export PATH="$CMAKE_3_12_4_PATH:$PATH"
+  # create pip installer
+  - export GiftGrab_PIP_INSTALLER_DIR="$SCRATCH_DIR/pip-installer"
+  - rm -rf "$GiftGrab_PIP_INSTALLER_DIR"
+  - mkdir -p "$GiftGrab_PIP_INSTALLER_DIR"
+  - cd "$GiftGrab_SOURCE_DIR"
+  - python setup.py sdist
+  - export GiftGrab_PIP_INSTALLER="$(ls dist | grep tar.gz)"
+  - if [ -z "$GiftGrab_PIP_INSTALLER" ]; then exit 1; fi
+  - mv dist/${GiftGrab_PIP_INSTALLER} "$GiftGrab_PIP_INSTALLER_DIR"
+  - export GiftGrab_PIP_INSTALLER="${GiftGrab_PIP_INSTALLER_DIR}/${GiftGrab_PIP_INSTALLER}"
+  - unset GiftGrab_PIP_INSTALLER_DIR
+  - cd "$GiftGrab_REPO_DIR"
+  # test launcher
+  - export GiftGrab_TEST_LAUNCHER=${GiftGrab_SOURCE_DIR}/tests/run-tests.sh
 
 stages:
+  - offline
+  - device-cmake
+  - device-pip
   - install
   - test_cmake
   - test_pypi
 
+build-py27:
+  stage: offline
+  script:
+    - export BOOST_ROOT=""  # otherwise tox complains!
+    # force use of Python 2.7 libs
+    - sed -i 's:PythonLibs REQUIRED:PythonLibs 2.7 REQUIRED:g' src/cmake/pythonlibs/CMakeLists.txt
+    - tox -c ci/build.tox.ini -e py27
+  tags:
+    - gift-adelie
+
+build-py35:
+  stage: offline
+  script:
+    - export BOOST_ROOT="/home/gitlab-runner/environments/giftgrab/install/boost"
+    # force use of Python 3 libs
+    - sed -i 's:PythonLibs REQUIRED:PythonLibs 3 REQUIRED:g' src/cmake/pythonlibs/CMakeLists.txt
+    - tox -c ci/build.tox.ini -e py35
+  tags:
+    - gift-adelie
+
+pip-py27:
+  stage: offline
+  script:
+    - export BOOST_ROOT=""  # otherwise tox complains!
+    - tox -c ci/pip.tox.ini -e py27
+  tags:
+    - gift-adelie
+
+pip-py35:
+  stage: offline
+  script:
+    - export BOOST_ROOT="/home/gitlab-runner/environments/giftgrab/install/boost"
+    - tox -c ci/pip.tox.ini -e py35
+  tags:
+    - gift-adelie
+
 ################## Platform: CMake ##################
 ################## Target: All ######################
 linux:
@@ -109,6 +166,7 @@ linux:
     - 224-add-a-citing-gift-grab-section-to-pypi-page
     - 225-add-citing-gift-grab-section-to-rtd-index
     - 223-add-some-information-on-the-main-doxygen-home-page
+    - 42-support-for-cross-python-testing
 
 ################## Platform: PyPI ##################
 ################## Target: All #####################
@@ -208,6 +266,7 @@ pypi:
     - 222-add-how-to-cite-block-in-main-readme
     - 225-add-citing-gift-grab-section-to-rtd-index
     - 223-add-some-information-on-the-main-doxygen-home-page
+    - 42-support-for-cross-python-testing
 
 ################## Device: Epiphan DVI2PCIe Duo ##################
 ################## Platform: PyPI ################################

diff --git a/ci/build.tox.ini b/ci/build.tox.ini
@@ -0,0 +1,79 @@
+[tox]
+envlist = py27,py35
+skipsdist = True
+
+[testenv]
+whitelist_externals =
+    echo
+    cmake
+    make
+    ctest
+passenv =
+    GiftGrab_SOURCE_DIR
+    SCRATCH_DIR
+    BOOST_ROOT
+setenv =
+    GiftGrab_BUILD_DIR = {env:SCRATCH_DIR}/build/{envname}
+    INSTALL_DIR = {env:SCRATCH_DIR}/install/{envname}
+changedir = {env:GiftGrab_BUILD_DIR}
+deps =
+    pytest
+    numpy
+    scipy
+commands =
+    ; bare-bones build
+    cmake -D CMAKE_INSTALL_PREFIX={env:INSTALL_DIR} {env:GiftGrab_SOURCE_DIR}
+    make -j
+    ; no ctest: no features activated to be tested yet
+    make install
+    ; Python and tests (currently all python)
+    cmake -D BOOST_ROOT={env:BOOST_ROOT} -D BUILD_PYTHON=ON -D BUILD_TESTS=ON .
+    make -j
+    ; no ctest: no features activated to be tested yet
+    make install
+    ; HEVC support
+    cmake -D USE_HEVC=ON .
+    make -j
+    ctest
+    make install
+    ; HEVC support with x265
+    cmake -D ENABLE_GPL=ON -D USE_X265=ON .
+    make -j
+    ctest
+    make install
+    ; turn x265 off explicitly for combination testing
+    cmake -D ENABLE_GPL=OFF -D USE_X265=OFF .
+    ; hardware-accelerated HEVC
+    cmake -D ENABLE_NONFREE=ON -D USE_NVENC=ON .
+    make -j
+    ctest
+    make install
+    ; Xvid support (OpenCV should get switched here)
+    cmake -D USE_XVID=ON .
+    make -j
+    ctest
+    make install
+    ; VP9 support
+    cmake -D USE_VP9=ON .
+    make -j
+    ; not executing VP9 tests due to issue #189
+    ctest -E Test_VP9
+    make install
+    ; NumPy support
+    cmake -D USE_NUMPY=ON .
+    make -j
+    ; not executing VP9 tests due to issue #189
+    ctest -E Test_VP9
+    make install
+    ; test support for video files
+    cmake -D USE_FILES=ON .
+    make -j
+    ; not executing VP9 tests due to issue #189
+    ctest -E Test_VP9
+    make install
+    ; build docs
+    cmake -D BUILD_DOC=ON .
+    make -j
+    ; no ctest: only checking whether doc building
+    ; properly here
+    make install
diff --git a/ci/pip.tox.ini b/ci/pip.tox.ini
@@ -0,0 +1,65 @@
+[tox]
+envlist = py27,py35
+skipsdist = True
+
+[testenv]
+whitelist_externals =
+    echo
+passenv =
+    GiftGrab_PIP_INSTALLER
+    SCRATCH_DIR
+    BOOST_ROOT
+    GiftGrab_TEST_LAUNCHER
+deps =
+    pytest
+    numpy
+    scipy
+commands =
+    # TODO: fail check disabled until we find a way
+    # to do this in tox
+    # pip install {env:GiftGrab_PIP_INSTALLER}
+    # HEVC support
+    pip install -vvv --install-option="--hevc" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc bgra
+    # HEVC support with x265
+    pip install -vvv --install-option="--hevc" --install-option="--enable-gpl" --install-option="--x265" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc bgra
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc i420
+    # hardware-accelerated HEVC
+    pip install -vvv --install-option="--hevc" --install-option="--enable-nonfree" --install-option="--nvenc" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc bgra
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc i420
+    # Xvid support
+    pip install -vvv --install-option="--hevc" --install-option="--enable-nonfree" --install-option="--nvenc" --install-option="--xvid" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    {env:GiftGrab_TEST_LAUNCHER} encode xvid bgra
+    # VP9 support
+    pip install -vvv --install-option="--hevc" --install-option="--enable-nonfree" --install-option="--nvenc" --install-option="--xvid" --install-option="--vp9" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    # not executing VP9 tests due to issue #189
+    # {env:GiftGrab_TEST_LAUNCHER} encode vp9 bgra
+    # {env:GiftGrab_TEST_LAUNCHER} encode vp9 i420
+    # NumPy support
+    pip install -vvv --install-option="--hevc" --install-option="--enable-nonfree" --install-option="--nvenc" --install-option="--xvid" --install-option="--vp9" --install-option="--numpy" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    # TODO: delete these five lines after issue #133
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc bgra
+    {env:GiftGrab_TEST_LAUNCHER} encode hevc i420
+    {env:GiftGrab_TEST_LAUNCHER} encode xvid bgra
+    # not executing VP9 tests due to issue #189
+    # {env:GiftGrab_TEST_LAUNCHER} encode vp9 bgra
+    # {env:GiftGrab_TEST_LAUNCHER} encode vp9 i420
+    # Run the actual NumPy tests
+    pip install numpy
+    {env:GiftGrab_TEST_LAUNCHER} numpy bgra
+    {env:GiftGrab_TEST_LAUNCHER} numpy i420
+    # test support for video files
+    pip install -vvv --install-option="--hevc" --install-option="--enable-nonfree" --install-option="--nvenc" --install-option="--xvid" --install-option="--vp9" --install-option="--numpy" --install-option="--files" --upgrade {env:GiftGrab_PIP_INSTALLER}
+    {env:GiftGrab_TEST_LAUNCHER} decode hevc bgra
+    {env:GiftGrab_TEST_LAUNCHER} decode hevc i420
+    {env:GiftGrab_TEST_LAUNCHER} decode hevc uyvy
+    {env:GiftGrab_TEST_LAUNCHER} decode xvid bgra
+    {env:GiftGrab_TEST_LAUNCHER} decode xvid i420
+    {env:GiftGrab_TEST_LAUNCHER} decode xvid uyvy
+    # not executing VP9 tests due to issue #189
+    # {env:GiftGrab_TEST_LAUNCHER} decode vp9 bgra
+    # {env:GiftGrab_TEST_LAUNCHER} decode vp9 i420
+    # {env:GiftGrab_TEST_LAUNCHER} decode vp9 uyvy
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT(GiftGrab)
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 # Will be used when installing
 SET(GiftGrab_PATH_SUFFIX giftgrab)

diff --git a/src/cmake/blackmagicsdk/CMakeLists.txt b/src/cmake/blackmagicsdk/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 if(NOT DEFINED ENV{BlackmagicSDK_DIR})
     MESSAGE(FATAL_ERROR

diff --git a/src/cmake/boost.python/CMakeLists.txt b/src/cmake/boost.python/CMakeLists.txt
@@ -1,8 +1,28 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
-SET(GG_BOOST_COMPONENTS python)
+if(NOT PYTHONLIBS_VERSION_STRING)
+    MESSAGE(FATAL_ERROR "Could not determine Python version")
+endif()
+if(PYTHONLIBS_VERSION_STRING MATCHES ^3\.*)
+    SET(GG_BOOST_PYTHON_SUFFIX 3)
+elseif(PYTHONLIBS_VERSION_STRING MATCHES ^2\.7\.*)
+    SET(GG_BOOST_PYTHON_SUFFIX "")
+else()
+    MESSAGE(FATAL_ERROR "Found unsupported Python version ${PYTHONLIBS_VERSION_STRING}")
+endif()
+
+SET(GG_BOOST_COMPONENTS python${GG_BOOST_PYTHON_SUFFIX})
 if(USE_NUMPY)
-    LIST(APPEND GG_BOOST_COMPONENTS numpy)
+    if(BOOST_ROOT AND GG_BOOST_PYTHON_SUFFIX)
+        # The following line is a workaround to a problem related to issue #50.
+        # In the case of specifying a custom Boost via e.g. BOOST_ROOT on a system
+        # with another (global) Boost installation, pkg-config's linker flags lead
+        # to the implicit discovery of the system-wide Boost.Python (version 2!)
+        # library, which gets linked into GIFT-Grab and causes conflicts with the
+        # specified Boost installation
+        LIST(APPEND GG_BOOST_COMPONENTS python)
+    endif()
+    LIST(APPEND GG_BOOST_COMPONENTS numpy${GG_BOOST_PYTHON_SUFFIX})
 endif(USE_NUMPY)
 FIND_PACKAGE(Boost COMPONENTS ${GG_BOOST_COMPONENTS} REQUIRED)
 SET(Boost_INCLUDE_DIR ${Boost_INCLUDE_DIR}

diff --git a/src/cmake/cpp11/CMakeLists.txt b/src/cmake/cpp11/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 # C++11
 INCLUDE(CheckCXXCompilerFlag)

diff --git a/src/cmake/epiphansdk/CMakeLists.txt b/src/cmake/epiphansdk/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 if(NOT DEFINED ENV{EpiphanSDK_DIR})
     MESSAGE(FATAL_ERROR

diff --git a/src/cmake/ffmpeg/CMakeLists.txt b/src/cmake/ffmpeg/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 # Augment module path to be able to find needed packages
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/src/cmake/libvlc/CMakeLists.txt b/src/cmake/libvlc/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 # Augment module path to be able to find needed packages
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/src/cmake/opencv/CMakeLists.txt b/src/cmake/opencv/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 FIND_PACKAGE(OpenCV REQUIRED)
 SET(OpenCV_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS}

diff --git a/src/cmake/platform/CMakeLists.txt b/src/cmake/platform/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
 # Unsupported platforms
 if(APPLE)

diff --git a/src/cmake/pythonlibs/CMakeLists.txt b/src/cmake/pythonlibs/CMakeLists.txt
@@ -1,9 +1,12 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
 
-FIND_PACKAGE(PythonLibs 2.7 REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
     CACHE INTERNAL "PythonLibs include dirs"
 )
 SET(PYTHON_LIBRARIES ${PYTHON_LIBRARIES}
     CACHE INTERNAL "PythonLibs libraries"
 )
+SET(PYTHONLIBS_VERSION_STRING ${PYTHONLIBS_VERSION_STRING}
+    CACHE INTERNAL "PythonLibs version string"
+)
diff --git a/src/python/modules/giftgrab/utils/inspection.py b/src/python/modules/giftgrab/utils/inspection.py
@@ -1,6 +1,11 @@
 from subprocess import check_output
 
 
+equals_char = b'='
+slash_char = b'/'
+double_quote_char = b'"'
+
+
 def frame_rate(file_path):
     """Use ``ffprobe`` to inspect frame rate of video file
 
@@ -16,7 +21,7 @@ def frame_rate(file_path):
                                    '-of', 'flat=s=_',
                                    '-show_entries', 'stream=r_frame_rate',
                                    file_path])
-    frame_rate_str = ffprobe_output.split('=')[1].strip()[1:-1].split('/')
+    frame_rate_str = ffprobe_output.split(equals_char)[1].strip()[1:-1].split(slash_char)
     fr = -1
     if len(frame_rate_str) == 1:
         fr = float(frame_rate_str[0])
@@ -62,7 +67,7 @@ def duration(file_path):
                                    '-of', 'flat=s=_',
                                    '-show_entries', 'format=duration',
                                    file_path])
-    duration_str = ffprobe_output.split('=')[1].strip()[1:-1]
+    duration_str = ffprobe_output.split(equals_char)[1].strip()[1:-1]
     dur = -1
     if duration_str is not None:
         dur = float(duration_str)
@@ -97,7 +102,7 @@ def resolution(file_path):
     res = []
     for ffprobe_command in ffprobe_commands:
         ffprobe_output = check_output(ffprobe_command)
-        resolution_str = ffprobe_output.split('=')[1].strip()
+        resolution_str = ffprobe_output.split(equals_char)[1].strip()
         if resolution_str is not None:
             res.append(float(resolution_str))
         else:
@@ -123,7 +128,7 @@ def codec(file_path):
                                    '-of', 'flat=s=_',
                                    '-show_entries', 'stream=codec_name',
                                    file_path])
-    codec_str = ffprobe_output.split('=')[1].strip().strip('"')
+    codec_str = ffprobe_output.split(equals_char)[1].strip().strip(double_quote_char)
     if codec_str is not None:
         return codec_str
     else:

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # to avoid copying stuff around
-SET(PYTHONPATH "${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}")
+SET(PYTHONPATH "${CMAKE_SOURCE_DIR}/tests:$ENV{PYTHONPATH}")
 SET(PYTHONPATH "${CMAKE_SOURCE_DIR}/python/modules:${PYTHONPATH}")
-SET(PYTHONPATH "${CMAKE_SOURCE_DIR}/tests:${PYTHONPATH}")
+SET(PYTHONPATH "${CMAKE_BINARY_DIR}:${PYTHONPATH}")
 
 # Obtain Catch header for testing
 SET(CATCH_DIR "${CMAKE_BINARY_DIR}/extern/Catch")