From 168af40fe9a3cc81c6ee16b3e81f154780c36bdb Mon Sep 17 00:00:00 2001
From: Scheaven <xuepengqiang>
Date: 星期四, 03 六月 2021 15:03:27 +0800
Subject: [PATCH] up new v4

---
 lib/detecter_tools/darknet/softmax_layer.h |   64 +++++++++++++++++++------------
 1 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/lib/detecter_tools/darknet/softmax_layer.h b/lib/detecter_tools/darknet/softmax_layer.h
index 1c4ade2..c86997b 100644
--- a/lib/detecter_tools/darknet/softmax_layer.h
+++ b/lib/detecter_tools/darknet/softmax_layer.h
@@ -1,25 +1,39 @@
-#ifndef SOFTMAX_LAYER_H
-#define SOFTMAX_LAYER_H
-#include "layer.h"
-#include "network.h"
-
-typedef layer softmax_layer;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-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
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+#ifndef SOFTMAX_LAYER_H
+#define SOFTMAX_LAYER_H
+#include "layer.h"
+#include "network.h"
+
+typedef layer softmax_layer;
+typedef layer contrastive_layer;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+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
+
+//-----------------------
+
+contrastive_layer make_contrastive_layer(int batch, int w, int h, int n, int classes, int inputs, layer *yolo_layer);
+void forward_contrastive_layer(contrastive_layer l, network_state state);
+void backward_contrastive_layer(contrastive_layer l, network_state net);
+
+#ifdef GPU
+void pull_contrastive_layer_output(const contrastive_layer l);
+void push_contrastive_layer_output(const contrastive_layer l);
+void forward_contrastive_layer_gpu(contrastive_layer l, network_state state);
+void backward_contrastive_layer_gpu(contrastive_layer layer, network_state state);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif

--
Gitblit v1.8.0