From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/softmax_layer.h | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/softmax_layer.h b/src/softmax_layer.h
index 3632c74..f29c652 100644
--- a/src/softmax_layer.h
+++ b/src/softmax_layer.h
@@ -1,27 +1,19 @@
#ifndef SOFTMAX_LAYER_H
#define SOFTMAX_LAYER_H
+#include "params.h"
+#include "layer.h"
-typedef struct {
- int inputs;
- int batch;
- int groups;
- float *delta;
- float *output;
- #ifdef GPU
- float * delta_gpu;
- float * output_gpu;
- #endif
-} softmax_layer;
+typedef layer softmax_layer;
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);
+softmax_layer make_softmax_layer(int batch, int inputs, int groups);
+void forward_softmax_layer(const softmax_layer l, network_state state);
+void backward_softmax_layer(const softmax_layer l, network_state state);
#ifdef GPU
-void pull_softmax_layer_output(const softmax_layer layer);
-void forward_softmax_layer_gpu(const softmax_layer layer, float *input);
-void backward_softmax_layer_gpu(const softmax_layer layer, float *delta);
+void pull_softmax_layer_output(const softmax_layer l);
+void forward_softmax_layer_gpu(const softmax_layer l, network_state state);
+void backward_softmax_layer_gpu(const softmax_layer l, network_state state);
#endif
#endif
--
Gitblit v1.10.0