cuDNN 6.0 supported. Also speed of console example improved.

AlexeyAB

2017-08-02 bc810016a1f2eadf33a1ac800b64962a42f3d402

cuDNN 6.0 supported. Also speed of console example improved.

 src/convolutional_layer.c

@@ -146,8 +146,12 @@
    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); 
    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);
    cudnnGetConvolutionForwardAlgorithm(cudnn_handle(),
#if(CUDNN_MAJOR >= 6)
    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->weightDesc,
            l->convDesc,

 src/yolo_console_dll.cpp

@@ -73,14 +73,21 @@
#ifdef OPENCV
            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
                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
                for(cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
                    std::vector<bbox_t> result_vec = detector.detect(frame, 0.2);
                    result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
                for (cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
                    auto image_ptr = detector.mat_to_image(frame);
                    std::thread td([&]() { thread_result_vec = detector.detect(*image_ptr, 0.2); });

                    draw_boxes(frame, result_vec, obj_names, 3);
                    show_result(result_vec, obj_names);
                    if (!prev_frame.empty()) {
                        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