Better VOC handling and resizing

This commit is contained in:
Joseph Redmon
2014-03-12 21:57:34 -07:00
parent 15e86996d6
commit 2ea63c0e99
21 changed files with 288 additions and 173 deletions

View File

@ -3,13 +3,14 @@
#include <stdlib.h>
#include <stdio.h>
softmax_layer *make_softmax_layer(int inputs)
softmax_layer *make_softmax_layer(int batch, int inputs)
{
fprintf(stderr, "Softmax Layer: %d inputs\n", inputs);
softmax_layer *layer = calloc(1, sizeof(softmax_layer));
layer->batch = batch;
layer->inputs = inputs;
layer->output = calloc(inputs, sizeof(float));
layer->delta = calloc(inputs, sizeof(float));
layer->output = calloc(inputs*batch, sizeof(float));
layer->delta = calloc(inputs*batch, sizeof(float));
return layer;
}
@ -28,28 +29,30 @@ void forward_softmax_layer(const softmax_layer layer, float *input)
*/
void forward_softmax_layer(const softmax_layer layer, float *input)
{
int i;
float sum = 0;
float largest = 0;
for(i = 0; i < layer.inputs; ++i){
if(input[i] > largest) largest = input[i];
}
for(i = 0; i < layer.inputs; ++i){
sum += exp(input[i]-largest);
//printf("%f, ", input[i]);
}
//printf("\n");
if(sum) sum = largest+log(sum);
else sum = largest-100;
for(i = 0; i < layer.inputs; ++i){
layer.output[i] = exp(input[i]-sum);
int i,b;
for(b = 0; b < layer.batch; ++b){
float sum = 0;
float largest = 0;
for(i = 0; i < layer.inputs; ++i){
if(input[i+b*layer.inputs] > largest) largest = input[i+b*layer.inputs];
}
for(i = 0; i < layer.inputs; ++i){
sum += exp(input[i+b*layer.inputs]-largest);
//printf("%f, ", input[i]);
}
//printf("\n");
if(sum) sum = largest+log(sum);
else sum = largest-100;
for(i = 0; i < layer.inputs; ++i){
layer.output[i+b*layer.inputs] = exp(input[i+b*layer.inputs]-sum);
}
}
}
void backward_softmax_layer(const softmax_layer layer, float *input, float *delta)
{
int i;
for(i = 0; i < layer.inputs; ++i){
for(i = 0; i < layer.inputs*layer.batch; ++i){
delta[i] = layer.delta[i];
}
}