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.h |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/softmax_layer.h b/src/softmax_layer.h
index c8ebddf..3632c74 100644
--- a/src/softmax_layer.h
+++ b/src/softmax_layer.h
@@ -1,28 +1,27 @@
 #ifndef SOFTMAX_LAYER_H
 #define SOFTMAX_LAYER_H
 
-#include "opencl.h"
-
 typedef struct {
     int inputs;
     int batch;
+    int groups;
     float *delta;
     float *output;
-    float *jacobian;
     #ifdef GPU
-    cl_mem delta_cl;
-    cl_mem output_cl;
+    float * delta_gpu;
+    float * output_gpu;
     #endif
 } softmax_layer;
 
-softmax_layer *make_softmax_layer(int batch, int inputs);
+void softmax_array(float *input, int n, float *output);
+softmax_layer *make_softmax_layer(int batch, int groups, int inputs);
 void forward_softmax_layer(const softmax_layer layer, float *input);
 void backward_softmax_layer(const softmax_layer layer, float *delta);
 
 #ifdef GPU
 void pull_softmax_layer_output(const softmax_layer layer);
-void forward_softmax_layer_gpu(const softmax_layer layer, cl_mem input);
-void backward_softmax_layer_gpu(const softmax_layer layer, cl_mem delta);
+void forward_softmax_layer_gpu(const softmax_layer layer, float *input);
+void backward_softmax_layer_gpu(const softmax_layer layer, float *delta);
 #endif
 
 #endif

--
Gitblit v1.10.0