]> rtime.felk.cvut.cz Git - opencv.git/commitdiff
tbb support added for cv and build system
authoranatoly <anatoly@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Fri, 26 Feb 2010 13:38:40 +0000 (13:38 +0000)
committeranatoly <anatoly@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Fri, 26 Feb 2010 13:38:40 +0000 (13:38 +0000)
git-svn-id: https://code.ros.org/svn/opencv/trunk@2725 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

opencv/CMakeLists.txt
opencv/OpenCVFindTBB.cmake [new file with mode: 0644]
opencv/cvconfig.h.cmake
opencv/src/cv/_cv.h

index 4e691f8d95e44e9c269500e741b33261ba296c96..8632307f655118b4aad5fe4cb970d7772b976921 100644 (file)
@@ -276,6 +276,8 @@ if(UNIX)
     set(WITH_XINE ON CACHE BOOL "Include Xine support")\r
 endif()\r
 \r
+set(WITH_TBB ON CACHE BOOL "Include TBB support")\r
+\r
 # ===================================================\r
 # Macros that checks if module have been installed.\r
 # After it adds module to build and define\r
@@ -476,6 +478,41 @@ if(PYTHONLIBS_FOUND AND BUILD_SWIG_PYTHON_SUPPORT)
     find_package(SWIG)\r
 endif()\r
 \r
+############################### TBB ################################\r
+\r
+if (WITH_TBB)\r
+    if (WIN32 OR APPLE)\r
+        include(OpenCVFindTBB.cmake)\r
+        if (TBB_FOUND)\r
+            set(HAVE_TBB 1)\r
+\r
+            if(NOT "${TBB_INCLUDE_DIRS}" STREQUAL "")\r
+                include_directories("${TBB_INCLUDE_DIRS}")\r
+            endif()\r
+\r
+            link_directories("${TBB_LIBRARY_DIRS}")\r
+            if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")\r
+                set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_DEBUG_LIBRARIES})\r
+            else()\r
+                set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})\r
+            endif()\r
+        endif()\r
+    else()\r
+        PKG_CHECK_MODULES(TBB tbb)\r
+        message(STATUS "TBB detected: ${TBBLIB_FOUND}")\r
+\r
+        if (TBB_FOUND)\r
+            set(HAVE_TBB 1)\r
+\r
+            if(NOT "${TBB_INCLUDE_DIRS}" STREQUAL "")\r
+                include_directories("${TBB_INCLUDE_DIRS}")\r
+            endif()\r
+\r
+            link_directories("${TBB_LIBRARY_DIRS}")\r
+            set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})\r
+        endif()\r
+    endif()\r
+endif()\r
 \r
 ############################### IPP ################################\r
 set(IPP_FOUND)\r
diff --git a/opencv/OpenCVFindTBB.cmake b/opencv/OpenCVFindTBB.cmake
new file mode 100644 (file)
index 0000000..737ade3
--- /dev/null
@@ -0,0 +1,191 @@
+# Locate Intel Threading Building Blocks include paths and libraries
+# TBB can be found at http://www.threadingbuildingblocks.org/ 
+# Written by Hannes Hofmann, hannes.hofmann _at_ informatik.uni-erlangen.de
+# Adapted by Gino van den Bergen gino _at_ dtecta.com
+
+# GvdB: This module uses the environment variable TBB_ARCH_PLATFORM which defines architecture and compiler.
+#   e.g. "ia32/vc8" or "em64t/cc4.1.0_libc2.4_kernel2.6.16.21"
+#   TBB_ARCH_PLATFORM is set by the build script tbbvars[.bat|.sh|.csh], which can be found
+#   in the TBB installation directory (TBB_INSTALL_DIR).
+#
+# For backwards compatibility, you may explicitely set the CMake variables TBB_ARCHITECTURE and TBB_COMPILER.
+# TBB_ARCHITECTURE     [ ia32 | em64t | itanium ]
+#   which architecture to use
+# TBB_COMPILER         e.g. vc9 or cc3.2.3_libc2.3.2_kernel2.4.21 or cc4.0.1_os10.4.9
+#   which compiler to use (detected automatically on Windows)
+
+# This module respects
+# TBB_INSTALL_DIR or $ENV{TBB21_INSTALL_DIR} or $ENV{TBB_INSTALL_DIR}
+
+# This module defines
+# TBB_INCLUDE_DIRS, where to find task_scheduler_init.h, etc.
+# TBB_LIBRARY_DIRS, where to find libtbb, libtbbmalloc
+# TBB_INSTALL_DIR, the base TBB install directory
+# TBB_LIBRARIES, the libraries to link against to use TBB.
+# TBB_DEBUG_LIBRARIES, the libraries to link against to use TBB with debug symbols.
+# TBB_FOUND, If false, don't try to use TBB.
+
+
+if (WIN32)
+    # has em64t/vc8   em64t/vc9
+    # has ia32/vc7.1  ia32/vc8   ia32/vc9
+    set(_TBB_DEFAULT_INSTALL_DIR "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")
+    set(_TBB_LIB_NAME "tbb")
+    set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
+    set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
+    set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
+    if (MSVC71)
+        set (_TBB_COMPILER "vc7.1")
+    endif(MSVC71)
+    if (MSVC80)
+        set(_TBB_COMPILER "vc8")
+    endif(MSVC80)
+    if (MSVC90)
+        set(_TBB_COMPILER "vc9")
+    endif(MSVC90)
+    if (NOT _TBB_COMPILER)
+        message("ERROR: TBB supports only VC 7.1, 8 and 9 compilers on Windows platforms.")
+    endif (NOT _TBB_COMPILER)
+    set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
+endif (WIN32)
+
+if (UNIX)
+    if (APPLE)
+        # MAC
+        set(_TBB_DEFAULT_INSTALL_DIR "/Library/Frameworks/Intel_TBB.framework/Versions")
+        # libs: libtbb.dylib, libtbbmalloc.dylib, *_debug
+        set(_TBB_LIB_NAME "tbb")
+        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
+        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
+        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
+        # has only one flavor: ia32/cc4.0.1_os10.4.9
+        set(_TBB_COMPILER "cc4.0.1_os10.4.9")
+        set(_TBB_ARCHITECTURE "ia32")
+    else (APPLE)
+        # LINUX
+        set(_TBB_DEFAULT_INSTALL_DIR "/opt/intel/tbb" "/usr/local/include" "/usr/include")
+        set(_TBB_LIB_NAME "tbb")
+        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
+        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
+        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
+        # has em64t/cc3.2.3_libc2.3.2_kernel2.4.21  em64t/cc3.3.3_libc2.3.3_kernel2.6.5  em64t/cc3.4.3_libc2.3.4_kernel2.6.9  em64t/cc4.1.0_libc2.4_kernel2.6.16.21
+        # has ia32/*
+        # has itanium/*
+        set(_TBB_COMPILER ${TBB_COMPILER})
+        set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
+    endif (APPLE)
+endif (UNIX)
+
+if (CMAKE_SYSTEM MATCHES "SunOS.*")
+# SUN
+# not yet supported
+# has em64t/cc3.4.3_kernel5.10
+# has ia32/*
+endif (CMAKE_SYSTEM MATCHES "SunOS.*")
+
+
+#-- Clear the public variables
+set (TBB_FOUND "NO")
+
+
+#-- Find TBB install dir and set ${_TBB_INSTALL_DIR} and cached ${TBB_INSTALL_DIR}
+# first: use CMake variable TBB_INSTALL_DIR
+if (TBB_INSTALL_DIR)
+    set (_TBB_INSTALL_DIR ${TBB_INSTALL_DIR})
+endif (TBB_INSTALL_DIR)
+# second: use environment variable
+if (NOT _TBB_INSTALL_DIR)
+    if (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
+        set (_TBB_INSTALL_DIR $ENV{TBB_INSTALL_DIR})
+    endif (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
+    # Intel recommends setting TBB21_INSTALL_DIR
+    if (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
+        set (_TBB_INSTALL_DIR $ENV{TBB21_INSTALL_DIR})
+    endif (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
+endif (NOT _TBB_INSTALL_DIR)
+# third: try to find path automatically
+if (NOT _TBB_INSTALL_DIR)
+    if (_TBB_DEFAULT_INSTALL_DIR)
+        set (_TBB_INSTALL_DIR $ENV{_TBB_DEFAULT_INSTALL_DIR})
+    endif (_TBB_DEFAULT_INSTALL_DIR)
+endif (NOT _TBB_INSTALL_DIR)
+# sanity check
+if (NOT _TBB_INSTALL_DIR)
+    message ("ERROR: TBB_INSTALL_DIR not found. ${_TBB_INSTALL_DIR}")
+else (NOT _TBB_INSTALL_DIR)
+# finally: set the cached CMake variable TBB_INSTALL_DIR
+if (NOT TBB_INSTALL_DIR)
+    set (TBB_INSTALL_DIR ${_TBB_INSTALL_DIR} CACHE PATH "Intel TBB install directory")
+    mark_as_advanced(TBB_INSTALL_DIR)
+endif (NOT TBB_INSTALL_DIR)
+
+
+#-- A macro to rewrite the paths of the library. This is necessary, because 
+#   find_library() always found the em64t/vc9 version of the TBB libs
+macro(TBB_CORRECT_LIB_DIR var_name)
+#    if (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
+        string(REPLACE em64t "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
+#    endif (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
+    string(REPLACE ia32 "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
+    string(REPLACE vc7.1 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
+    string(REPLACE vc8 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
+    string(REPLACE vc9 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
+endmacro(TBB_CORRECT_LIB_DIR var_content)
+
+
+#-- Look for include directory and set ${TBB_INCLUDE_DIR}
+set (TBB_INC_SEARCH_DIR ${_TBB_INSTALL_DIR}/include)
+find_path(TBB_INCLUDE_DIR
+    tbb/task_scheduler_init.h
+    PATHS ${TBB_INC_SEARCH_DIR}
+)
+mark_as_advanced(TBB_INCLUDE_DIR)
+
+
+#-- Look for libraries
+# GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh]
+if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
+    set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib")
+else (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
+    # HH: deprecated
+    message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set $ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).")
+    set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/${_TBB_ARCHITECTURE}/${_TBB_COMPILER}/lib")
+endif (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
+
+
+find_library(TBB_LIBRARY        ${_TBB_LIB_NAME}        ${TBB_LIBRARY_DIR} NO_DEFAULT_PATH)
+find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} ${TBB_LIBRARY_DIR} NO_DEFAULT_PATH)
+#TBB_CORRECT_LIB_DIR(TBB_LIBRARY)
+#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY)
+mark_as_advanced(TBB_LIBRARY TBB_MALLOC_LIBRARY)
+
+#-- Look for debug libraries
+find_library(TBB_LIBRARY_DEBUG        ${_TBB_LIB_DEBUG_NAME}        ${TBB_LIBRARY_DIR} NO_DEFAULT_PATH)
+find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} ${TBB_LIBRARY_DIR} NO_DEFAULT_PATH)
+#TBB_CORRECT_LIB_DIR(TBB_LIBRARY_DEBUG)
+#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY_DEBUG)
+mark_as_advanced(TBB_LIBRARY_DEBUG TBB_MALLOC_LIBRARY_DEBUG)
+
+
+if (TBB_INCLUDE_DIR)
+    if (TBB_LIBRARY)
+        set (TBB_FOUND "YES")
+        set (TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY} ${TBB_LIBRARIES})
+        set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARY_DEBUG} ${TBB_MALLOC_LIBRARY_DEBUG} ${TBB_DEBUG_LIBRARIES})
+        set (TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR} CACHE PATH "TBB include directory" FORCE)
+        set (TBB_LIBRARY_DIRS ${TBB_LIBRARY_DIR} CACHE PATH "TBB library directory" FORCE)
+        mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARY_DIRS TBB_LIBRARIES TBB_DEBUG_LIBRARIES)
+        message(STATUS "Found Intel TBB")
+    endif (TBB_LIBRARY)
+endif (TBB_INCLUDE_DIR)
+
+if (NOT TBB_FOUND)
+    message("ERROR: Intel TBB NOT found!")
+    message(STATUS "Looked for Threading Building Blocks in ${_TBB_INSTALL_DIR}")
+    # do only throw fatal, if this pkg is REQUIRED
+    if (TBB_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find TBB library.")
+    endif (TBB_FIND_REQUIRED)
+endif (NOT TBB_FOUND)
+
+endif (NOT _TBB_INSTALL_DIR)
index dc61c7480ec997889eea767d613b277030704941..f77d5fec7e4899c713318332900b1034330a50b8 100644 (file)
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine  WORDS_BIGENDIAN
 
+/* Intel Threading Building Blocks */
+#cmakedefine  HAVE_TBB
\ No newline at end of file
index 50c39200b54c990a70d6e1d0fad81a311dba6e4d..40ad283dc3c234e278c668b7c07dce25d0da97d2 100644 (file)
 #include <limits.h>\r
 #include <float.h>\r
 \r
+#ifdef HAVE_CONFIG_H\r
+    #include <cvconfig.h>\r
+#endif\r
+\r
 #ifdef __BORLANDC__\r
 #ifndef WIN32\r
     #define     WIN32\r
@@ -139,4 +143,18 @@ CvPyramid;
 #include "_cvgeom.h"\r
 #include "_cvimgproc.h"\r
 \r
+\r
+\r
+#ifdef HAVE_TBB\r
+    #include "tbb/tbb_stddef.h"\r
+    #if TBB_VERSION_MAJOR*100 + TBB_VERSION_MINOR >= 202\r
+        #include "tbb/tbb.h"\r
+        #undef min\r
+        #undef max\r
+    #else\r
+        #undef HAVE_TBB\r
+    #endif\r
+#endif\r
+\r
+\r
 #endif /*_CV_INTERNAL_H_*/\r