From c40cdeb4021fc1a638969563972f13c9f5e90d74 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 Oct 2015 19:50:43 +0000
Subject: [PATCH] lots of comparator stuff
---
src/network.c | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/network.c b/src/network.c
index d823c15..063a1bb 100644
--- a/src/network.c
+++ b/src/network.c
@@ -29,15 +29,26 @@
float get_current_rate(network net)
{
int batch_num = get_current_batch(net);
+ int i;
+ float rate;
switch (net.policy) {
case CONSTANT:
return net.learning_rate;
case STEP:
- return net.learning_rate * pow(net.gamma, batch_num/net.step);
+ return net.learning_rate * pow(net.scale, batch_num/net.step);
+ case STEPS:
+ rate = net.learning_rate;
+ for(i = 0; i < net.num_steps; ++i){
+ if(net.steps[i] > batch_num) return rate;
+ rate *= net.scales[i];
+ }
+ return rate;
case EXP:
return net.learning_rate * pow(net.gamma, batch_num);
case POLY:
return net.learning_rate * pow(1 - (float)batch_num / net.max_batches, net.power);
+ case SIG:
+ return net.learning_rate * (1./(1.+exp(net.gamma*(batch_num - net.step))));
default:
fprintf(stderr, "Policy is weird!\n");
return net.learning_rate;
@@ -319,6 +330,7 @@
//if(w == net->w && h == net->h) return 0;
net->w = w;
net->h = h;
+ int inputs = 0;
//fprintf(stderr, "Resizing to %d x %d...", w, h);
//fflush(stderr);
for (i = 0; i < net->n; ++i){
@@ -332,9 +344,12 @@
break;
}else if(l.type == NORMALIZATION){
resize_normalization_layer(&l, w, h);
+ }else if(l.type == COST){
+ resize_cost_layer(&l, inputs);
}else{
error("Cannot resize this type of layer");
}
+ inputs = l.outputs;
net->layers[i] = l;
w = l.out_w;
h = l.out_h;
@@ -525,12 +540,12 @@
return acc;
}
-float *network_accuracies(network net, data d)
+float *network_accuracies(network net, data d, int n)
{
static float acc[2];
matrix guess = network_predict_data(net, d);
- acc[0] = matrix_topk_accuracy(d.y, guess,1);
- acc[1] = matrix_topk_accuracy(d.y, guess,5);
+ acc[0] = matrix_topk_accuracy(d.y, guess, 1);
+ acc[1] = matrix_topk_accuracy(d.y, guess, n);
free_matrix(guess);
return acc;
}
--
Gitblit v1.10.0