opencv compile not for dw

This commit is contained in:
Francesco Gatti
2017-08-22 02:33:08 -07:00
parent c41a0a09a6
commit 37b050a9c8
2 changed files with 7 additions and 4 deletions
+6 -3
View File
@@ -19,11 +19,11 @@ endif()
find_package(CUDA QUIET REQUIRED)
find_package(OpenCV QUIET)
if(${OpenCV_FOUND})
if(OPENCV)
message("Compiling with openCV support")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENCV")
else()
message(WARNING "OpenCV not found, compiling without it")
message(WARNING "compiling without OpenCV")
endif()
cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS})
@@ -36,7 +36,10 @@ cuda_add_library(kernels SHARED src/kernels/activation_elu.cu
file(GLOB tkdnn_SRC "src/*.cpp")
set(tkdnn_LIBS kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
if(!OPENCV)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS})
add_library(tkDNN SHARED ${tkdnn_SRC})
target_link_libraries(tkDNN ${tkdnn_LIBS})
+1 -1
View File
@@ -282,7 +282,7 @@ void RegionInterpret::interpretData(dnnType *data_h) {
void RegionInterpret::showImageResult(dnnType *input_h) {
#ifdef OPENCV
dataDim_t dim = net->input_dim;
dataDim_t dim = input_dim;
// read an image
cv::Mat r(dim.h, dim.w, CV_32F, input_h);
cv::Mat g(dim.h, dim.w, CV_32F, input_h + dim.h*dim.w);