From c123f320fcc2212f1d3b59a4d3d2ae6be71cf1e6 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 04 Mar 2018 20:41:23 +0000
Subject: [PATCH] Show avg-loss chart during Training, if compiled with OpenCV. Use -dont_show to disable.
---
src/classifier.c | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/classifier.c b/src/classifier.c
index 5e718c5..d42a917 100644
--- a/src/classifier.c
+++ b/src/classifier.c
@@ -362,11 +362,11 @@
int *indexes = calloc(topk, sizeof(int));
for(i = 0; i < m; ++i){
- int class = -1;
+ int class_id = -1;
char *path = paths[i];
for(j = 0; j < classes; ++j){
if(strstr(path, labels[j])){
- class = j;
+ class_id = j;
break;
}
}
@@ -396,9 +396,9 @@
free_image(im);
top_k(pred, classes, topk, indexes);
free(pred);
- if(indexes[0] == class) avg_acc += 1;
+ if(indexes[0] == class_id) avg_acc += 1;
for(j = 0; j < topk; ++j){
- if(indexes[j] == class) avg_topk += 1;
+ if(indexes[j] == class_id) avg_topk += 1;
}
printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1));
@@ -435,11 +435,11 @@
int size = net.w;
for(i = 0; i < m; ++i){
- int class = -1;
+ int class_id = -1;
char *path = paths[i];
for(j = 0; j < classes; ++j){
if(strstr(path, labels[j])){
- class = j;
+ class_id = j;
break;
}
}
@@ -456,9 +456,9 @@
free_image(resized);
top_k(pred, classes, topk, indexes);
- if(indexes[0] == class) avg_acc += 1;
+ if(indexes[0] == class_id) avg_acc += 1;
for(j = 0; j < topk; ++j){
- if(indexes[j] == class) avg_topk += 1;
+ if(indexes[j] == class_id) avg_topk += 1;
}
printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1));
@@ -497,11 +497,11 @@
int *indexes = calloc(topk, sizeof(int));
for(i = 0; i < m; ++i){
- int class = -1;
+ int class_id = -1;
char *path = paths[i];
for(j = 0; j < classes; ++j){
if(strstr(path, labels[j])){
- class = j;
+ class_id = j;
break;
}
}
@@ -519,9 +519,9 @@
free_image(crop);
top_k(pred, classes, topk, indexes);
- if(indexes[0] == class) avg_acc += 1;
+ if(indexes[0] == class_id) avg_acc += 1;
for(j = 0; j < topk; ++j){
- if(indexes[j] == class) avg_topk += 1;
+ if(indexes[j] == class_id) avg_topk += 1;
}
printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1));
@@ -559,11 +559,11 @@
int *indexes = calloc(topk, sizeof(int));
for(i = 0; i < m; ++i){
- int class = -1;
+ int class_id = -1;
char *path = paths[i];
for(j = 0; j < classes; ++j){
if(strstr(path, labels[j])){
- class = j;
+ class_id = j;
break;
}
}
@@ -583,9 +583,9 @@
free_image(im);
top_k(pred, classes, topk, indexes);
free(pred);
- if(indexes[0] == class) avg_acc += 1;
+ if(indexes[0] == class_id) avg_acc += 1;
for(j = 0; j < topk; ++j){
- if(indexes[j] == class) avg_topk += 1;
+ if(indexes[j] == class_id) avg_topk += 1;
}
printf("%d: top 1: %f, top %d: %f\n", i, avg_acc/(i+1), topk, avg_topk/(i+1));
@@ -706,8 +706,9 @@
strtok(input, "\n");
}
image im = load_image_color(input, 0, 0);
- image r = resize_min(im, size);
- resize_network(&net, r.w, r.h);
+ image r = letterbox_image(im, net.w, net.h);
+ //image r = resize_min(im, size);
+ //resize_network(&net, r.w, r.h);
printf("%d %d\n", r.w, r.h);
float *X = r.data;
--
Gitblit v1.10.0