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

Modify yolov4_berkeley link for download, clean to merge with master

Browse Source 
Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>
This commit is contained in:
Micaela Verucchi
2020-06-01 15:17:53 +02:00
parent d936e5f740
commit a0e4e9f209
8 changed files with 8 additions and 2015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tkDNN/DetectionNN.h
+4 -4
View File
@@ -14,7 +14,7 @@
#include "tkdnn.h"
#define OPENCV_CUDACONTRIB //if OPENCV has been compiled with CUDA and contrib.
// #define OPENCV_CUDACONTRIB //if OPENCV has been compiled with CUDA and contrib.
#ifdef OPENCV_CUDACONTRIB
#include <opencv2/cudawarping.hpp>
@@ -104,7 +104,7 @@ class DetectionNN {
FatalError("A batch size greater than nBatches cannot be used");
originalSize.clear();
if(VERBOSE) printCenteredTitle(" TENSORRT detection ", '=', 30);
if(TKDNN_VERBOSE) printCenteredTitle(" TENSORRT detection ", '=', 30);
{
TIMER_START
for(int bi=0; bi<cur_batches;++bi){
@@ -121,11 +121,11 @@ class DetectionNN {
tk::dnn::dataDim_t dim = netRT->input_dim;
dim.n = cur_batches;
{
if(VERBOSE) dim.print();
if(TKDNN_VERBOSE) dim.print();
TIMER_START
netRT->infer(dim, input_d);
TIMER_STOP
if(VERBOSE) dim.print();
if(TKDNN_VERBOSE) dim.print();
stats.push_back(t_ns);
if(save_times) *times<<t_ns<<";";
}
include/tkDNN/utils.h
+2 -2
View File
@@ -36,7 +36,7 @@
#define COL_PURPLEB "\033[1;35m"
#define COL_CYANB "\033[1;36m"
#define VERBOSE 0
#define TKDNN_VERBOSE 0
// Simple Timer
#define TIMER_START timespec start, end; \
@@ -47,7 +47,7 @@
(double)(end.tv_nsec - start.tv_nsec))/1.0e6; \
if(show) std::cout<<col<<"Time:"<<std::setw(16)<<t_ns<<" ms\n"<<COL_END;
#define TIMER_STOP TIMER_STOP_C(COL_CYANB, VERBOSE)
#define TIMER_STOP TIMER_STOP_C(COL_CYANB, TKDNN_VERBOSE)
/********************************************************
* Prints the error message, and exits