Merge pull request #95 from gift-surg/81-run-with-python37-on-windows…

…-for-91 Run with Python 3.7 on Windows for #91
gift-surg · Apr 16, 2019 · bd6ec39 · bd6ec39
2 parents 9cb4cb8 + d741f09
commit bd6ec39
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 20 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -554,14 +554,20 @@ windows:
   variables:
     EpiphanSDK_DIR: C:/Program Files/Epiphan/epiphan_sdk-3.30.3.0007
     zlib_root: C:/Program Files/zlib/zlib-1.2.3-lib
+    boost_includedir: C:/Boost/boost_1_69_0
+    boost_librarydir: C:/Boost/boost_1_69_0/stage/lib
+    python_include_dirs: C:/Python/Python3.7.1/include
+    python_library: C:/Python/Python3.7.1/libs/python37.lib
   before_script:
     - echo "This is the Windows script's before_script to be able to skip global before_script, which is Linux-specific"
   script:
     - mkdir build
     - cd build
-    - cmake -D CMAKE_BUILD_TYPE=Release -D ZLIB_ROOT="%zlib_root%" -D USE_EPIPHAN_DVI2PCIE_DUO=ON -D ENABLE_NONFREE=ON -D USE_EPIPHANSDK=ON -D USE_BGRA=OFF ../src
+    - cmake -A x64 -D CMAKE_BUILD_TYPE=Release -D PYTHON_INCLUDE_DIRS="%python_include_dirs%" -D PYTHON_LIBRARY="%python_library%" -D BOOST_INCLUDEDIR="%boost_includedir%" -D BOOST_LIBRARYDIR="%boost_librarydir%" -D ZLIB_ROOT="%zlib_root%" -D BUILD_PYTHON=ON -D USE_NUMPY=ON -D USE_EPIPHAN_DVI2PCIE_DUO=ON -D ENABLE_NONFREE=ON -D USE_EPIPHANSDK=ON -D USE_BGRA=OFF ../src
     - cmake --build . --config Release
     - ls
+    - cd Release
+    - python -c "from pygiftgrab import VideoSourceFactory"
   tags:
     - gift-hopper
     - windows
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -169,6 +169,11 @@ endif(USE_NUMPY AND NOT BUILD_PYTHON)
 # Library name
 SET(NAME giftgrab)
 
+# For generating import lib in Windows
+if(WIN32)
+    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+
 # Library include dirs
 INCLUDE_DIRECTORIES(api)
 INCLUDE_DIRECTORIES(utils)
@@ -187,6 +192,7 @@ SET(HEADERS
     api/videosourcefactory.h
     api/videotargetfactory.h
     api/except.h
+    api/exports.h
 )
 SET(SOURCES
     api/iobservable.cpp
@@ -338,13 +344,23 @@ endif(BUILD_TESTS)
 # Python wrappers
 if(BUILD_PYTHON)
     SET(NAME_PYTHON py${NAME})
-    ADD_LIBRARY(${NAME_PYTHON} SHARED python/gil.h python/wrapper.cpp)
+    PYTHON_ADD_MODULE(${NAME_PYTHON} python/gil.h python/wrapper.cpp)
     TARGET_LINK_LIBRARIES(${NAME_PYTHON} ${Boost_LIBRARIES} ${NAME})
     # no lib prefix
     SET_TARGET_PROPERTIES(${NAME_PYTHON} PROPERTIES PREFIX "")
     LIST(APPEND INSTALLABLES ${NAME_PYTHON})
 endif(BUILD_PYTHON)
 
+# For generating import lib in Windows
+if(WIN32)
+    INCLUDE(GenerateExportHeader)
+
+    GENERATE_EXPORT_HEADER(${NAME}
+        EXPORT_MACRO_NAME GG_EXPORTS
+        EXPORT_FILE_NAME gg_exports_win.h
+        STATIC_DEFINE GG_EXPORTS_BUILT_AS_STATIC
+        )
+endif()
 
 # Install
 INSTALL(

diff --git a/src/api/except.h b/src/api/except.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include <stdexcept>
 #include <string>
 
@@ -13,7 +14,7 @@ namespace gg {
 //! \attention <b>In Python:</b> This exception
 //! maps to \c RuntimeError
 //!
-class BasicException : public std::exception {
+class GG_EXPORTS BasicException : public std::exception {
 protected:
     //!
     //! \brief Exception details
@@ -47,7 +48,7 @@ class BasicException : public std::exception {
 //! \attention <b>In Python:</b> This exception
 //! maps to \c IOError
 //!
-class DeviceAlreadyConnected : public BasicException
+class GG_EXPORTS DeviceAlreadyConnected : public BasicException
 {
 public:
     //!
@@ -71,7 +72,7 @@ class DeviceAlreadyConnected : public BasicException
 //! \attention <b>In Python:</b> This exception
 //! maps to \c IOError
 //!
-class DeviceNotFound : public BasicException {
+class GG_EXPORTS DeviceNotFound : public BasicException {
 public:
     //!
     //! \brief
@@ -94,7 +95,7 @@ class DeviceNotFound : public BasicException {
 //! \attention <b>In Python:</b> This exception
 //! maps to \c IOError
 //!
-class DeviceOffline : public BasicException {
+class GG_EXPORTS DeviceOffline : public BasicException {
 public:
     //!
     //! \brief
@@ -117,7 +118,7 @@ class DeviceOffline : public BasicException {
 //! \attention <b>In Python:</b> This exception
 //! maps to \c RuntimeError
 //!
-class VideoTargetError : public BasicException
+class GG_EXPORTS VideoTargetError : public BasicException
 {
 public:
     //!
@@ -141,7 +142,7 @@ class VideoTargetError : public BasicException
 //! \attention <b>In Python:</b> This exception
 //! maps to \c RuntimeError
 //!
-class VideoSourceError : public BasicException
+class GG_EXPORTS VideoSourceError : public BasicException
 {
 public:
     //!
@@ -164,7 +165,7 @@ class VideoSourceError : public BasicException
 //! \attention <b>In Python:</b> This exception
 //! maps to \c RuntimeError
 //!
-class ObserverError : public BasicException
+class GG_EXPORTS ObserverError : public BasicException
 {
 public:
     //!
@@ -187,7 +188,7 @@ class ObserverError : public BasicException
 //! \attention <b>In Python:</b> This exception
 //! maps to \c IOError
 //!
-class NetworkSourceUnavailable : public BasicException
+class GG_EXPORTS NetworkSourceUnavailable : public BasicException
 {
 public:
     //!

diff --git a/src/api/exports.h b/src/api/exports.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#ifdef WIN32
+#include "gg_exports_win.h"
+#else
+#define GG_EXPORTS
+#endif
diff --git a/src/api/iobservable.h b/src/api/iobservable.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "iobserver.h"
 #include <vector>
 #include <mutex>
@@ -39,7 +40,7 @@ namespace gg
 //! ensuring data is promptly copied to their own
 //! data buffer.
 //!
-class IObservable
+class GG_EXPORTS IObservable
 {
 protected:
     //!

diff --git a/src/api/iobserver.h b/src/api/iobserver.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "videoframe.h"
 
 namespace gg
@@ -32,7 +33,7 @@ namespace gg
 //!         pass
 //! \endcode
 //!
-class IObserver
+class GG_EXPORTS IObserver
 {
 public:
     //!

diff --git a/src/api/ivideosource.h b/src/api/ivideosource.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "videoframe.h"
 #include "except.h"
 #include "iobservable.h"
@@ -12,7 +13,7 @@
 //! This enables the underlying algorithms to be agnostic of
 //! the data sources.
 //!
-class IVideoSource : public gg::IObservable
+class GG_EXPORTS IVideoSource : public gg::IObservable
 {
 public:
     //!

diff --git a/src/api/ivideotarget.h b/src/api/ivideotarget.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "videoframe.h"
 #include "except.h"
 #include "iobserver.h"
@@ -14,7 +15,7 @@ namespace gg
 //! functionality to save streamed video e.g.
 //! to files
 //!
-class IVideoTarget : public IObserver
+class GG_EXPORTS IVideoTarget : public IObserver
 {
 protected:
     //!

diff --git a/src/api/videoframe.h b/src/api/videoframe.h
@@ -14,6 +14,7 @@ namespace cv
 #endif
 #endif // USE_OPENCV
 
+#include "exports.h"
 #include <memory>
 #include "maskframe.h"
 #include "except.h"
@@ -44,7 +45,7 @@ enum ColourSpace
 //! within a single frame object, so as to preserve temporal
 //! relations and to facilitate potential stereo encoding.
 //!
-class VideoFrame
+class GG_EXPORTS VideoFrame
 {
 protected:
     //!

diff --git a/src/api/videosourcefactory.h b/src/api/videosourcefactory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "ivideosource.h"
 #include "device.h"
 #include "codec.h"
@@ -22,7 +23,7 @@ namespace gg
 //! \sa IVideoSource
 //! \sa Device
 //!
-class VideoSourceFactory
+class GG_EXPORTS VideoSourceFactory
 {
 protected:
     //!

diff --git a/src/api/videotargetfactory.h b/src/api/videotargetfactory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "exports.h"
 #include "macros.h"
 #include "codec.h"
 #include "ivideotarget.h"
@@ -19,7 +20,7 @@ namespace gg
 //!
 //! \sa IVideoTarget
 //!
-class VideoTargetFactory
+class GG_EXPORTS VideoTargetFactory
 {
 protected:
     //!

diff --git a/src/cmake/boost.python/CMakeLists.txt b/src/cmake/boost.python/CMakeLists.txt
@@ -1,8 +1,38 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0)
 
-SET(GG_BOOST_COMPONENTS python)
+if(NOT PYTHONLIBS_VERSION_STRING)
+    # Needed in case PythonLibs discovery script not run, see
+    # https://github.com/gift-surg/GIFT-Grab/issues/83
+    # TODO handle this more elegantly
+    ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/../../cmake/pythonlibs ${CMAKE_CURRENT_BINARY_DIR}/cmake/pythonlibs-redundant-run)
+    if(NOT PYTHONLIBS_VERSION_STRING)
+        MESSAGE(FATAL_ERROR "Could not determine Python version")
+    endif()
+endif()
+if(PYTHONLIBS_VERSION_STRING MATCHES ^3\.*)
+    if(UNIX)
+        SET(GG_BOOST_PYTHON_SUFFIX 3)
+    elseif(WIN32)
+        if(PYTHONLIBS_VERSION_STRING MATCHES ^3\.7\.*)
+            SET(GG_BOOST_PYTHON_SUFFIX 37)
+        else()
+            MESSAGE(FATAL_ERROR
+                "Found Python version ${PYTHONLIBS_VERSION_STRING} (on Windows only 3.7 is experimentally supported)")
+        endif()
+    endif()
+elseif(PYTHONLIBS_VERSION_STRING MATCHES ^2\.7\.*)
+    if(UNIX)
+        SET(GG_BOOST_PYTHON_SUFFIX "")
+    elseif(WIN32)
+        SET(GG_BOOST_PYTHON_SUFFIX 27)
+    endif()
+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)
+    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/pythonlibs/CMakeLists.txt b/src/cmake/pythonlibs/CMakeLists.txt
@@ -7,3 +7,6 @@ SET(PYTHON_INCLUDE_DIRS ${PYTHON_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/epiphansdk/epiphansdk_video_source.h b/src/epiphansdk/epiphansdk_video_source.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "exports.h"
 #include "frmgrab.h"
 #include "ivideosource.h"
 #include "macros.h"
@@ -7,7 +8,7 @@
 namespace gg
 {
 
-class VideoSourceEpiphanSDK : public IVideoSource
+class GG_EXPORTS VideoSourceEpiphanSDK : public IVideoSource
 {
 protected:
     //!