mmr/tkDNN
Archived
1
0
Fork 0
Code Issues 46 Pull Requests 12 Releases 4 Activity

class in box

Browse Source
This commit is contained in:
Francesco Gatti
2017-08-22 06:37:43 -07:00
parent 37b050a9c8
commit 0119b31455
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -37,7 +37,7 @@ file(GLOB tkdnn_SRC "src/*.cpp")
set(tkdnn_LIBS kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS}) set(tkdnn_LIBS kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11") 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") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif() endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS})
@@ -74,4 +74,4 @@ endif()
message("install dir:" ${CMAKE_INSTALL_PREFIX}) message("install dir:" ${CMAKE_INSTALL_PREFIX})
install(DIRECTORY include/ DESTINATION include/${CMAKE_PROJECT_NAME} install(DIRECTORY include/ DESTINATION include/${CMAKE_PROJECT_NAME}
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(TARGETS tkDNN DESTINATION lib) install(TARGETS tkDNN kernels DESTINATION lib)
include/Layer.h
+1
View File
@@ -274,6 +274,7 @@ public:
struct box { struct box {
int cl;
float x, y, w, h; float x, y, w, h;
}; };
struct sortable_bbox { struct sortable_bbox {
src/Region.cpp
+2
View File
@@ -256,6 +256,7 @@ void RegionInterpret::interpretData(dnnType *data_h) {
} }
// //
res_boxes_n = 0;
//print results //print results
for(int i = 0; i < tot; ++i){ for(int i = 0; i < tot; ++i){
int cl = max_index(probs[i], classes); int cl = max_index(probs[i], classes);
@@ -273,6 +274,7 @@ void RegionInterpret::interpretData(dnnType *data_h) {
b.y = y; b.y = y;
b.h = h; b.h = h;
b.w = w; b.w = w;
b.cl = cl;
res_boxes[res_boxes_n] = b; res_boxes[res_boxes_n] = b;
res_boxes_n++; res_boxes_n++;
} }