From e29fcb703f8d936e17507bf78043a8b8bc6279b0 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 16 May 2018 12:23:34 +0000
Subject: [PATCH] Fixed time for ./darknet detector valid
---
src/detector.c | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/detector.c b/src/detector.c
index a38ed18..bed7467 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -1,3 +1,8 @@
+#ifdef _DEBUG
+#include <stdlib.h>
+#include <crtdbg.h>
+#endif
+
#include "network.h"
#include "region_layer.h"
#include "cost_layer.h"
@@ -16,10 +21,10 @@
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
-#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION)
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)"" CVAUX_STR(CV_VERSION_MINOR)"" CVAUX_STR(CV_VERSION_REVISION)
#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib")
#else
-#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)"" CVAUX_STR(CV_VERSION_MAJOR)"" CVAUX_STR(CV_VERSION_MINOR)
#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
@@ -61,6 +66,11 @@
srand(time(0));
network net = nets[0];
+ if ((net.batch * net.subdivisions) == 1) {
+ printf("\n Error: You set incorrect value batch=1 for Training! You should set batch=64 subdivision=64 \n");
+ getchar();
+ }
+
int imgs = net.batch * net.subdivisions * ngpus;
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
data train, buffer;
@@ -116,12 +126,16 @@
while(get_current_batch(net) < net.max_batches){
if(l.random && count++%10 == 0){
printf("Resizing\n");
- int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
- //if (get_current_batch(net)+100 > net.max_batches) dim = 544;
+ //int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
//int dim = (rand() % 4 + 16) * 32;
- printf("%d\n", dim);
- args.w = dim;
- args.h = dim;
+ //if (get_current_batch(net)+100 > net.max_batches) dim = 544;
+ int random_val = rand() % 12;
+ int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160
+ int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160
+
+ printf("%d x %d \n", dim_w, dim_h);
+ args.w = dim_w;
+ args.h = dim_h;
pthread_join(load_thread, 0);
train = buffer;
@@ -129,7 +143,7 @@
load_thread = load_data(args);
for(i = 0; i < ngpus; ++i){
- resize_network(nets + i, dim, dim);
+ resize_network(nets + i, dim_w, dim_h);
}
net = nets[0];
}
@@ -411,7 +425,7 @@
fprintf(fp, "\n]\n");
fclose(fp);
}
- fprintf(stderr, "Total Detection Time: %f Seconds\n", time(0) - start);
+ fprintf(stderr, "Total Detection Time: %f Seconds\n", (double)time(0) - start);
}
void validate_detector_recall(char *datacfg, char *cfgfile, char *weightfile)
@@ -1108,6 +1122,22 @@
#endif
if (filename) break;
}
+
+ // free memory
+ free_ptrs(names, net.layers[net.n - 1].classes);
+ free_list(options);
+
+ int i;
+ const int nsize = 8;
+ for (j = 0; j < nsize; ++j) {
+ for (i = 32; i < 127; ++i) {
+ free_image(alphabet[j][i]);
+ }
+ free(alphabet[j]);
+ }
+ free(alphabet);
+
+ free_network(net);
}
void run_detector(int argc, char **argv)
--
Gitblit v1.10.0