From 0713fd9784bbd0c67eb82df6f6e2c072a53e09e8 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 31 May 2018 11:20:19 +0000
Subject: [PATCH] Merge pull request #936 from IlyaOvodov/Fix_GrayScale_PR
---
src/softmax_layer.h | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/softmax_layer.h b/src/softmax_layer.h
index 2275250..821a8dd 100644
--- a/src/softmax_layer.h
+++ b/src/softmax_layer.h
@@ -1,16 +1,19 @@
#ifndef SOFTMAX_LAYER_H
#define SOFTMAX_LAYER_H
+#include "layer.h"
+#include "network.h"
-typedef struct {
- int inputs;
- int batch;
- float *delta;
- float *output;
- float *jacobian;
-} softmax_layer;
+typedef layer softmax_layer;
-softmax_layer *make_softmax_layer(int batch, int inputs);
-void forward_softmax_layer(const softmax_layer layer, float *input);
-void backward_softmax_layer(const softmax_layer layer, float *input, float *delta);
+void softmax_array(float *input, int n, float temp, float *output);
+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 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