From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp
---
src/softmax_layer.h | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/softmax_layer.h b/src/softmax_layer.h
index 0cc9d53..821a8dd 100644
--- a/src/softmax_layer.h
+++ b/src/softmax_layer.h
@@ -1,26 +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;
- #ifdef GPU
- float * delta_gpu;
- float * output_gpu;
- #endif
-} 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 *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 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