From db0397cfaaf488364e3d2e1669dfefae2ee6ea73 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Dec 2015 19:57:10 +0000
Subject: [PATCH] shortcut layers, msr networks
---
src/layer.h | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index 2b136a0..1b12009 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -3,6 +3,9 @@
#include "activations.h"
+struct layer;
+typedef struct layer layer;
+
typedef enum {
CONVOLUTIONAL,
DECONVOLUTIONAL,
@@ -15,24 +18,23 @@
ROUTE,
COST,
NORMALIZATION,
- REGION,
- AVGPOOL
+ AVGPOOL,
+ LOCAL,
+ SHORTCUT
} LAYER_TYPE;
typedef enum{
SSE, MASKED
} COST_TYPE;
-typedef struct {
+struct layer{
LAYER_TYPE type;
ACTIVATION activation;
COST_TYPE cost_type;
int batch_normalize;
int batch;
int forced;
- int object_logistic;
- int class_logistic;
- int coord_logistic;
+ int flipped;
int inputs;
int outputs;
int truths;
@@ -48,6 +50,7 @@
int crop_height;
int sqrt;
int flip;
+ int index;
float angle;
float jitter;
float saturation;
@@ -133,11 +136,12 @@
float * x_gpu;
float * x_norm_gpu;
float * weights_gpu;
- float * biases_gpu;
- float * scales_gpu;
-
float * weight_updates_gpu;
+
+ float * biases_gpu;
float * bias_updates_gpu;
+
+ float * scales_gpu;
float * scale_updates_gpu;
float * output_gpu;
@@ -146,7 +150,7 @@
float * squared_gpu;
float * norms_gpu;
#endif
-} layer;
+};
void free_layer(layer);
--
Gitblit v1.10.0