generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation under mac

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-05-18 13:02:27 +00:00
parent 8a47b3d5d5
commit 7d350280c0
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gpu/CMakeLists.txt
View File

@ -35,12 +35,12 @@ if (HAVE_CUDA)
endif() endif()
if (HAVE_CUDA) if (HAVE_CUDA)
get_filename_component(_path_to_findnpp "${CMAKE_CURRENT_LIST_FILE}" PATH) #get_filename_component(_path_to_findnpp "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_path_to_findnpp}) #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_path_to_findnpp})
find_package(NPP 3.2.16 REQUIRED) #find_package(NPP 3.2.16 REQUIRED)
message(STATUS "NPP detected: " ${NPP_VERSION}) #message(STATUS "NPP detected: " ${NPP_VERSION})
include_directories(${CUDA_INCLUDE_DIRS} ${CUDA_NPP_INCLUDES}) include_directories(${CUDA_INCLUDE_DIRS})
if (UNIX OR APPLE) if (UNIX OR APPLE)
set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-fPIC;") set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-fPIC;")
@ -128,8 +128,12 @@ set_target_properties(${the_target} PROPERTIES
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} ) target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} )
if (HAVE_CUDA) if (HAVE_CUDA)
target_link_libraries(${the_target} ${CUDA_LIBRARIES} ${CUDA_NPP_LIBRARIES}) target_link_libraries(${the_target} ${CUDA_LIBRARIES})
CUDA_ADD_CUFFT_TO_TARGET(${the_target}) CUDA_ADD_CUFFT_TO_TARGET(${the_target})
unset(CUDA_npp_LIBRARY CACHE)
find_cuda_helper_libs(npp)
target_link_libraries(${the_target} ${CUDA_npp_LIBRARY})
endif() endif()
if(MSVC) if(MSVC)

2
modules/gpu/src/nvidia/core/NCV.cu
View File

@ -575,7 +575,7 @@ typedef struct _NcvTimeMoment NcvTimeMoment;
return 1000.0 * 2 * ((t2->moment) - (t1->moment)) / (t1->freq + t2->freq); return 1000.0 * 2 * ((t2->moment) - (t1->moment)) / (t1->freq + t2->freq);
} }
#elif defined(__unix__) #elif defined(__GNUC__)
#include <sys/time.h> #include <sys/time.h>

9
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
View File

@ -11,7 +11,7 @@
#include <float.h> #include <float.h>
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(__APPLE__)
#include <fpu_control.h> #include <fpu_control.h>
#endif #endif
@ -48,6 +48,9 @@ bool TestHaarCascadeApplication::init()
bool TestHaarCascadeApplication::process() bool TestHaarCascadeApplication::process()
{ {
#if defined(__APPLE)
return true;
#endif
NCVStatus ncvStat; NCVStatus ncvStat;
bool rcode = false; bool rcode = false;
@ -200,6 +203,8 @@ bool TestHaarCascadeApplication::process()
} }
ncvAssertReturn(cudaSuccess == cudaStreamSynchronize(0), false); ncvAssertReturn(cudaSuccess == cudaStreamSynchronize(0), false);
#if !defined(__APPLE__)
#if defined(__GNUC__) #if defined(__GNUC__)
//http://www.christian-seiler.de/projekte/fpmath/ //http://www.christian-seiler.de/projekte/fpmath/
@ -229,6 +234,8 @@ bool TestHaarCascadeApplication::process()
searchRoiU, 1, 1.0f); searchRoiU, 1, 1.0f);
ncvAssertReturn(ncvStat == NCV_SUCCESS, false); ncvAssertReturn(ncvStat == NCV_SUCCESS, false);
_controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
#endif
#endif #endif
NCV_SKIP_COND_END NCV_SKIP_COND_END