From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic
---
src/softmax_layer.c | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/softmax_layer.c b/src/softmax_layer.c
index 28696b7..a200ae5 100644
--- a/src/softmax_layer.c
+++ b/src/softmax_layer.c
@@ -1,34 +1,61 @@
#include "softmax_layer.h"
+#include "blas.h"
+#include "cuda.h"
+#include <float.h>
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
+#include <assert.h>
-softmax_layer *make_softmax_layer(int inputs)
+softmax_layer *make_softmax_layer(int batch, int groups, int inputs)
{
- printf("Softmax Layer: %d inputs\n", inputs);
+ assert(inputs%groups == 0);
+ fprintf(stderr, "Softmax Layer: %d inputs\n", inputs);
softmax_layer *layer = calloc(1, sizeof(softmax_layer));
+ layer->batch = batch;
+ layer->groups = groups;
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));
+ #ifdef GPU
+ layer->output_gpu = cuda_make_array(layer->output, inputs*batch);
+ layer->delta_gpu = cuda_make_array(layer->delta, inputs*batch);
+ #endif
return layer;
}
-void forward_softmax_layer(const softmax_layer layer, double *input)
+void softmax_array(float *input, int n, float *output)
{
int i;
- double sum = 0;
- for(i = 0; i < layer.inputs; ++i){
- sum += exp(input[i]);
+ float sum = 0;
+ float largest = -FLT_MAX;
+ for(i = 0; i < n; ++i){
+ if(input[i] > largest) largest = input[i];
}
- for(i = 0; i < layer.inputs; ++i){
- layer.output[i] = exp(input[i])/sum;
+ for(i = 0; i < n; ++i){
+ sum += exp(input[i]-largest);
+ }
+ if(sum) sum = largest+log(sum);
+ else sum = largest-100;
+ for(i = 0; i < n; ++i){
+ 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 b;
+ int inputs = layer.inputs / layer.groups;
+ int batch = layer.batch * layer.groups;
+ for(b = 0; b < batch; ++b){
+ softmax_array(input+b*inputs, inputs, layer.output+b*inputs);
+ }
+}
+
+void backward_softmax_layer(const softmax_layer layer, 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];
}
}
--
Gitblit v1.10.0