From 6d56c38e8bcb9041335b03f27c192c24dfaedb1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 23:39:28 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/route_layer.h | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/route_layer.h b/src/route_layer.h
index 086ef87..45467d9 100644
--- a/src/route_layer.h
+++ b/src/route_layer.h
@@ -1,28 +1,18 @@
#ifndef ROUTE_LAYER_H
#define ROUTE_LAYER_H
#include "network.h"
+#include "layer.h"
-typedef struct {
- int batch;
- int outputs;
- int n;
- int * input_layers;
- int * input_sizes;
- float * delta;
- float * output;
- #ifdef GPU
- float * delta_gpu;
- float * output_gpu;
- #endif
-} route_layer;
+typedef layer route_layer;
-route_layer *make_route_layer(int batch, int n, int *input_layers, int *input_size);
-void forward_route_layer(const route_layer layer, network net);
-void backward_route_layer(const route_layer layer, network net);
+route_layer make_route_layer(int batch, int n, int *input_layers, int *input_size);
+void forward_route_layer(const route_layer l, network_state state);
+void backward_route_layer(const route_layer l, network_state state);
+void resize_route_layer(route_layer *l, network *net);
#ifdef GPU
-void forward_route_layer_gpu(const route_layer layer, network net);
-void backward_route_layer_gpu(const route_layer layer, network net);
+void forward_route_layer_gpu(const route_layer l, network_state state);
+void backward_route_layer_gpu(const route_layer l, network_state state);
#endif
#endif
--
Gitblit v1.10.0