From d9f1b0b16edeb59281355a855e18a8be343fc33c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 08 Aug 2014 19:04:15 +0000
Subject: [PATCH] probably how maxpool layers should be
---
src/softmax_layer.c | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/src/softmax_layer.c b/src/softmax_layer.c
index b213e5b..b6e9fe9 100644
--- a/src/softmax_layer.c
+++ b/src/softmax_layer.c
@@ -1,22 +1,26 @@
#include "softmax_layer.h"
+#include "mini_blas.h"
#include <math.h>
#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(double));
- layer->delta = calloc(inputs, sizeof(double));
+ layer->output = calloc(inputs*batch, sizeof(float));
+ layer->delta = calloc(inputs*batch, sizeof(float));
+ layer->jacobian = calloc(inputs*inputs*batch, sizeof(float));
return layer;
}
-void forward_softmax_layer(const softmax_layer layer, double *input)
+/* UNSTABLE!
+void forward_softmax_layer(const softmax_layer layer, float *input)
{
int i;
- double sum = 0;
+ float sum = 0;
for(i = 0; i < layer.inputs; ++i){
sum += exp(input[i]);
}
@@ -24,11 +28,55 @@
layer.output[i] = exp(input[i])/sum;
}
}
-
-void backward_softmax_layer(const softmax_layer layer, double *input, double *delta)
+*/
+void forward_softmax_layer(const softmax_layer layer, float *input)
{
+ 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,j,b;
+ for(b = 0; b < layer.batch; ++b){
+ for(i = 0; i < layer.inputs; ++i){
+ for(j = 0; j < layer.inputs; ++j){
+ int d = (i==j);
+ layer.jacobian[b*layer.inputs*layer.inputs + i*layer.inputs + j] =
+ layer.output[b*layer.inputs + i] * (d - layer.output[b*layer.inputs + j]);
+ }
+ }
+ }
+ for(b = 0; b < layer.batch; ++b){
+ int M = layer.inputs;
+ int N = 1;
+ int K = layer.inputs;
+ float *A = layer.jacobian + b*layer.inputs*layer.inputs;
+ float *B = layer.delta + b*layer.inputs;
+ float *C = delta + b*layer.inputs;
+ gemm(0,0,M,N,K,1,A,K,B,N,0,C,N);
+ }
+ */
+
int i;
- for(i = 0; i < layer.inputs; ++i){
+ for(i = 0; i < layer.inputs*layer.batch; ++i){
delta[i] = layer.delta[i];
}
}
--
Gitblit v1.10.0