diff --git a/CMakeLists.txt b/CMakeLists.txt index d046e61..814494a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ 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") -if(!OPENCV) +if(NOT 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}) @@ -74,4 +74,4 @@ endif() message("install dir:" ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY include/ DESTINATION include/${CMAKE_PROJECT_NAME} FILES_MATCHING PATTERN "*.h") -install(TARGETS tkDNN DESTINATION lib) +install(TARGETS tkDNN kernels DESTINATION lib) diff --git a/include/Layer.h b/include/Layer.h index 3cc2756..e3f8fc2 100644 --- a/include/Layer.h +++ b/include/Layer.h @@ -274,6 +274,7 @@ public: struct box { + int cl; float x, y, w, h; }; struct sortable_bbox { diff --git a/src/Region.cpp b/src/Region.cpp index bb9a81d..71495b6 100644 --- a/src/Region.cpp +++ b/src/Region.cpp @@ -256,6 +256,7 @@ void RegionInterpret::interpretData(dnnType *data_h) { } // + res_boxes_n = 0; //print results for(int i = 0; i < tot; ++i){ int cl = max_index(probs[i], classes); @@ -273,6 +274,7 @@ void RegionInterpret::interpretData(dnnType *data_h) { b.y = y; b.h = h; b.w = w; + b.cl = cl; res_boxes[res_boxes_n] = b; res_boxes_n++; }