mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

cuDNN 6.0 supported. Also speed of console example improved.

Browse Source
This commit is contained in:
AlexeyAB
2017-08-03 01:36:22 +03:00
parent ab1c5f9e57
commit bc810016a1
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/convolutional_layer.c
View File

@ -146,8 +146,12 @@ void cudnn_convolutional_setup(layer *l)
cudnnSetTensor4dDescriptor(l->srcTensorDesc, CUDNN_TENSOR_NCHW, CUDNN_DATA_FLOAT, l->batch, l->c, l->h, l->w); cudnnSetTensor4dDescriptor(l->srcTensorDesc, CUDNN_TENSOR_NCHW, CUDNN_DATA_FLOAT, l->batch, l->c, l->h, l->w);
cudnnSetTensor4dDescriptor(l->dstTensorDesc, CUDNN_TENSOR_NCHW, CUDNN_DATA_FLOAT, l->batch, l->out_c, l->out_h, l->out_w); cudnnSetTensor4dDescriptor(l->dstTensorDesc, CUDNN_TENSOR_NCHW, CUDNN_DATA_FLOAT, l->batch, l->out_c, l->out_h, l->out_w);
cudnnSetFilter4dDescriptor(l->weightDesc, CUDNN_DATA_FLOAT, CUDNN_TENSOR_NCHW, l->n, l->c, l->size, l->size); cudnnSetFilter4dDescriptor(l->weightDesc, CUDNN_DATA_FLOAT, CUDNN_TENSOR_NCHW, l->n, l->c, l->size, l->size);
cudnnSetConvolution2dDescriptor(l->convDesc, l->pad, l->pad, l->stride, l->stride, 1, 1, CUDNN_CROSS_CORRELATION); #if(CUDNN_MAJOR >= 6)
cudnnGetConvolutionForwardAlgorithm(cudnn_handle(), cudnnSetConvolution2dDescriptor(l->convDesc, l->pad, l->pad, l->stride, l->stride, 1, 1, CUDNN_CROSS_CORRELATION, CUDNN_DATA_FLOAT); // cudnn 6.0
#else
cudnnSetConvolution2dDescriptor(l->convDesc, l->pad, l->pad, l->stride, l->stride, 1, 1, CUDNN_CROSS_CORRELATION); // cudnn 5.1
#endif
cudnnGetConvolutionForwardAlgorithm(cudnn_handle(),
l->srcTensorDesc, l->srcTensorDesc,
l->weightDesc, l->weightDesc,
l->convDesc, l->convDesc,

19
src/yolo_console_dll.cpp
View File

@ -73,14 +73,21 @@ int main()
#ifdef OPENCV #ifdef OPENCV
std::string const file_ext = filename.substr(filename.find_last_of(".") + 1); std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov") { // video file if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov") { // video file
cv::Mat frame; cv::Mat frame, prev_frame;
std::vector<bbox_t> result_vec, thread_result_vec;
detector.nms = 0.02; // comment it - if track_id is not required detector.nms = 0.02; // comment it - if track_id is not required
for(cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) { for (cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
std::vector<bbox_t> result_vec = detector.detect(frame, 0.2); auto image_ptr = detector.mat_to_image(frame);
result_vec = detector.tracking(result_vec); // comment it - if track_id is not required std::thread td([&]() { thread_result_vec = detector.detect(*image_ptr, 0.2); });
draw_boxes(frame, result_vec, obj_names, 3); if (!prev_frame.empty()) {
show_result(result_vec, obj_names); result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
draw_boxes(prev_frame, result_vec, obj_names, 3);
show_result(result_vec, obj_names);
}
td.join();
prev_frame = frame;
result_vec = thread_result_vec;
} }
} }
else { // image file else { // image file