Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor OpenCL search

Browse Source
pull/664/head
Andrey Kamaev 12 years ago
parent 2afad8b575
commit d28df08eb0
3 changed files with 92 additions and 173 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      CMakeLists.txt
  2. 228
      cmake/OpenCVDetectOpenCL.cmake
  3. 26
      modules/ocl/CMakeLists.txt

11
CMakeLists.txt
Unescape View File

@ -412,15 +412,6 @@ endif()
# --- OpenCL --- # --- OpenCL ---
if(WITH_OPENCL) if(WITH_OPENCL)
include(cmake/OpenCVDetectOpenCL.cmake) include(cmake/OpenCVDetectOpenCL.cmake)
if(OPENCL_FOUND)
set(HAVE_OPENCL 1)
endif()
if(WITH_OPENCLAMDFFT AND CLAMDFFT_INCLUDE_DIR)
set(HAVE_CLAMDFFT 1)
endif()
if(WITH_OPENCLAMDBLAS AND CLAMDBLAS_INCLUDE_DIR)
set(HAVE_CLAMDBLAS 1)
endif()
endif() endif()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
@ -795,7 +786,7 @@ if(HAVE_OPENCL AND BUILD_opencv_ocl)
status("") status("")
status(" OpenCL") status(" OpenCL")
if(OPENCL_INCLUDE_DIR) if(OPENCL_INCLUDE_DIR)
status(" Include path:" ${OPENCL_INCLUDE_DIR}) status(" Include path:" ${OPENCL_INCLUDE_DIRS})
endif() endif()
if(OPENCL_LIBRARIES) if(OPENCL_LIBRARIES)
status(" libraries:" ${OPENCL_LIBRARIES}) status(" libraries:" ${OPENCL_LIBRARIES})

228
cmake/OpenCVDetectOpenCL.cmake
Unescape View File

@ -1,154 +1,104 @@
if(APPLE) if(APPLE)
set(OPENCL_FOUND YES) set(OPENCL_FOUND YES)
set(OPENCL_LIBRARIES "-framework OpenCL") set(OPENCL_LIBRARY "-framework OpenCL" CACHE STRING "OpenCL library")
else() set(OPENCL_INCLUDE_DIR "" CACHE STRING "OpenCL include directory")
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
else(APPLE)
find_package(OpenCL QUIET) find_package(OpenCL QUIET)
if(WITH_OPENCLAMDFFT)
set(CLAMDFFT_SEARCH_PATH $ENV{CLAMDFFT_PATH}) if (NOT OPENCL_FOUND)
if(NOT CLAMDFFT_SEARCH_PATH) find_path(OPENCL_ROOT_DIR
if(WIN32) NAMES OpenCL/cl.h CL/cl.h include/CL/cl.h include/nvidia-current/CL/cl.h
set( CLAMDFFT_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdFft" ) PATHS ENV OCLROOT ENV AMDAPPSDKROOT ENV CUDA_PATH ENV INTELOCLSDKROOT
endif() DOC "OpenCL root directory"
endif() NO_DEFAULT_PATH)
set( CLAMDFFT_INCLUDE_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}/include )
if(UNIX) find_path(OPENCL_INCLUDE_DIR
if(CMAKE_SIZEOF_VOID_P EQUAL 4) NAMES OpenCL/cl.h CL/cl.h
set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib) HINTS ${OPENCL_ROOT_DIR}
else() PATH_SUFFIXES include include/nvidia-current
set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib64) DOC "OpenCL include directory")
endif()
else() if (X86_64)
if(CMAKE_SIZEOF_VOID_P EQUAL 4) set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib32\\import) elseif (X86)
else() set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win32 lib/x86)
set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib64\\import)
endif()
endif() endif()
find_library(OPENCL_LIBRARY
NAMES OpenCL
HINTS ${OPENCL_ROOT_DIR}
PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
DOC "OpenCL library")
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENCL DEFAULT_MSG OPENCL_LIBRARY OPENCL_INCLUDE_DIR )
endif()
endif(APPLE)
if(OPENCL_FOUND)
set(HAVE_OPENCL 1)
set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
set(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
if (X86_64)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import)
elseif (X86)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import)
endif()
if(WITH_OPENCLAMDFFT)
find_path(CLAMDFFT_ROOT_DIR
NAMES include/clAmdFft.h
PATHS ENV CLAMDFFT_PATH ENV ProgramFiles
PATH_SUFFIXES clAmdFft AMD/clAmdFft
DOC "AMD FFT root directory"
NO_DEFAULT_PATH)
find_path(CLAMDFFT_INCLUDE_DIR find_path(CLAMDFFT_INCLUDE_DIR
NAMES clAmdFft.h NAMES clAmdFft.h
PATHS ${CLAMDFFT_INCLUDE_SEARCH_PATH} HINTS ${CLAMDFFT_ROOT_DIR}
PATH_SUFFIXES clAmdFft PATH_SUFFIXES include
NO_DEFAULT_PATH) DOC "clAmdFft include directory")
find_library(CLAMDFFT_LIBRARY find_library(CLAMDFFT_LIBRARY
NAMES clAmdFft.Runtime NAMES clAmdFft.Runtime
PATHS ${CLAMDFFT_LIB_SEARCH_PATH} HINTS ${CLAMDFFT_ROOT_DIR}
NO_DEFAULT_PATH) PATH_SUFFIXES ${CLAMD_POSSIBLE_LIB_SUFFIXES}
if(CLAMDFFT_LIBRARY) DOC "clAmdFft library")
set(CLAMDFFT_LIBRARIES ${CLAMDFFT_LIBRARY})
else() if(CLAMDFFT_LIBRARY AND CLAMDFFT_INCLUDE_DIR)
set(CLAMDFFT_LIBRARIES "") set(HAVE_CLAMDFFT 1)
endif() list(APPEND OPENCL_INCLUDE_DIRS "${CLAMDFFT_INCLUDE_DIR}")
endif() list(APPEND OPENCL_LIBRARIES "${CLAMDFFT_LIBRARY}")
if(WITH_OPENCLAMDBLAS)
set(CLAMDBLAS_SEARCH_PATH $ENV{CLAMDBLAS_PATH})
if(NOT CLAMDBLAS_SEARCH_PATH)
if(WIN32)
set( CLAMDBLAS_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdBlas" )
endif()
endif()
set( CLAMDBLAS_INCLUDE_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}/include )
if(UNIX)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib)
else()
set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib64)
endif()
else()
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib32\\import)
else()
set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib64\\import)
endif()
endif()
find_path(CLAMDBLAS_INCLUDE_DIR
NAMES clAmdBlas.h
PATHS ${CLAMDBLAS_INCLUDE_SEARCH_PATH}
PATH_SUFFIXES clAmdBlas
NO_DEFAULT_PATH)
find_library(CLAMDBLAS_LIBRARY
NAMES clAmdBlas
PATHS ${CLAMDBLAS_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
if(CLAMDBLAS_LIBRARY)
set(CLAMDBLAS_LIBRARIES ${CLAMDBLAS_LIBRARY})
else()
set(CLAMDBLAS_LIBRARIES "")
endif() endif()
endif() endif()
# Try AMD/ATI Stream SDK
if (NOT OPENCL_FOUND)
set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT})
set(ENV_AMDAPPSDKROOT $ENV{AMDAPPSDKROOT})
set(ENV_OPENCLROOT $ENV{OPENCLROOT})
set(ENV_CUDA_PATH $ENV{CUDA_PATH})
set(ENV_INTELOCLSDKROOT $ENV{INTELOCLSDKROOT})
if(ENV_AMDSTREAMSDKROOT)
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDAPPSDKROOT}/include)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86)
else()
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86_64)
endif()
elseif(ENV_AMDSTREAMSDKROOT)
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86)
else()
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64)
endif()
elseif(ENV_CUDA_PATH AND WIN32)
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_CUDA_PATH}/include)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/Win32)
else()
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/x64)
endif()
elseif(ENV_OPENCLROOT AND UNIX)
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_OPENCLROOT}/inc)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib)
else()
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib64)
endif()
elseif(ENV_INTELOCLSDKROOT)
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_INTELOCLSDKROOT}/include)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_INTELOCLSDKROOT}/lib/x86)
else()
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_INTELOCLSDKROOT}/lib/x64)
endif()
endif()
if(OPENCL_INCLUDE_SEARCH_PATH) if(WITH_OPENCLAMDBLAS)
find_path(OPENCL_INCLUDE_DIR find_path(CLAMDBLAS_ROOT_DIR
NAMES CL/cl.h OpenCL/cl.h NAMES include/clAmdBlas.h
PATHS ${OPENCL_INCLUDE_SEARCH_PATH} PATHS ENV CLAMDFFT_PATH ENV ProgramFiles
NO_DEFAULT_PATH) PATH_SUFFIXES clAmdBlas AMD/clAmdBlas
else() DOC "AMD FFT root directory"
find_path(OPENCL_INCLUDE_DIR NO_DEFAULT_PATH)
NAMES CL/cl.h OpenCL/cl.h)
endif()
if(OPENCL_LIB_SEARCH_PATH) find_path(CLAMDBLAS_INCLUDE_DIR
find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH) NAMES clAmdBlas.h
else() HINTS ${CLAMDBLAS_ROOT_DIR}
find_library(OPENCL_LIBRARY NAMES OpenCL) PATH_SUFFIXES include
endif() DOC "clAmdFft include directory")
include(FindPackageHandleStandardArgs) find_library(CLAMDBLAS_LIBRARY
find_package_handle_standard_args( NAMES clAmdBlas
OPENCL HINTS ${CLAMDBLAS_ROOT_DIR}
DEFAULT_MSG PATH_SUFFIXES ${CLAMD_POSSIBLE_LIB_SUFFIXES}
OPENCL_LIBRARY OPENCL_INCLUDE_DIR DOC "clAmdBlas library")
)
if(OPENCL_FOUND) if(CLAMDBLAS_LIBRARY AND CLAMDBLAS_INCLUDE_DIR)
set(OPENCL_LIBRARIES ${OPENCL_LIBRARY}) set(HAVE_CLAMDBLAS 1)
set(HAVE_OPENCL 1) list(APPEND OPENCL_INCLUDE_DIRS "${CLAMDBLAS_INCLUDE_DIR}")
else() list(APPEND OPENCL_LIBRARIES "${CLAMDBLAS_LIBRARY}")
set(OPENCL_LIBRARIES)
endif() endif()
else()
set(HAVE_OPENCL 1)
endif() endif()
endif() endif()

26
modules/ocl/CMakeLists.txt
Unescape View File

@ -1,12 +1,10 @@
# Will be modified later
if(NOT HAVE_OPENCL) if(NOT HAVE_OPENCL)
ocv_module_disable(ocl) ocv_module_disable(ocl)
endif() endif()
set(the_description "OpenCL-accelerated Computer Vision") set(the_description "OpenCL-accelerated Computer Vision")
ocv_add_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video opencv_nonfree) ocv_add_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video opencv_nonfree)
ocv_module_include_directories(${OPENCL_INCLUDE_DIRS})
ocv_module_include_directories()
file(GLOB CL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/kernels/*.cl") file(GLOB CL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/kernels/*.cl")
set(kernels_cpp "${CMAKE_CURRENT_BINARY_DIR}/kernels.cpp") set(kernels_cpp "${CMAKE_CURRENT_BINARY_DIR}/kernels.cpp")
@ -24,30 +22,10 @@ file(GLOB lib_int_hdrs "src/*.h*")
source_group("Include" FILES ${lib_hdrs}) source_group("Include" FILES ${lib_hdrs})
source_group("Src\\Host" FILES ${lib_srcs} ${lib_int_hdrs} ${kernels_cpp}) source_group("Src\\Host" FILES ${lib_srcs} ${lib_int_hdrs} ${kernels_cpp})
if (HAVE_OPENCL)
set(ocl_link_libs ${OPENCL_LIBRARIES})
if(OPENCL_INCLUDE_DIR)
ocv_include_directories(${OPENCL_INCLUDE_DIR})
endif()
if (HAVE_CLAMDFFT)
set(ocl_link_libs ${ocl_link_libs} ${CLAMDFFT_LIBRARIES})
ocv_include_directories(${CLAMDFFT_INCLUDE_DIR})
endif()
if (HAVE_CLAMDBLAS)
set(ocl_link_libs ${ocl_link_libs} ${CLAMDBLAS_LIBRARIES})
ocv_include_directories(${CLAMDBLAS_INCLUDE_DIR})
endif()
endif()
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
ocv_set_module_sources(HEADERS ${lib_hdrs} SOURCES ${lib_int_hdrs} ${lib_srcs} ${kernels_cpp}) ocv_set_module_sources(HEADERS ${lib_hdrs} SOURCES ${lib_int_hdrs} ${lib_srcs} ${kernels_cpp})
ocv_create_module(${ocl_link_libs}) ocv_create_module(${OPENCL_LIBRARIES})
install(FILES ${lib_hdrs}
DESTINATION include/opencv2/${name}
COMPONENT main)
ocv_add_precompiled_headers(${the_module}) ocv_add_precompiled_headers(${the_module})
################################################################################################################ ################################################################################################################

Write Preview
Loading…
Cancel
Save