From 68213b835b9f15cb449ad2037a8b51c17a3de07b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 22:10:14 +0000
Subject: [PATCH] Makefile
---
src/layer.h | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index b3ab627..3efd597 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,
@@ -16,20 +19,26 @@
COST,
NORMALIZATION,
AVGPOOL,
- LOCAL
+ LOCAL,
+ SHORTCUT,
+ ACTIVE,
+ RNN,
+ CRNN
} LAYER_TYPE;
typedef enum{
- SSE, MASKED
+ SSE, MASKED, SMOOTH
} COST_TYPE;
-typedef struct {
+struct layer{
LAYER_TYPE type;
ACTIVATION activation;
COST_TYPE cost_type;
int batch_normalize;
+ int shortcut;
int batch;
int forced;
+ int flipped;
int inputs;
int outputs;
int truths;
@@ -41,10 +50,13 @@
int side;
int stride;
int pad;
- int crop_width;
- int crop_height;
int sqrt;
int flip;
+ int index;
+ int binary;
+ int steps;
+ int hidden;
+ float dot;
float angle;
float jitter;
float saturation;
@@ -72,6 +84,7 @@
int dontload;
int dontloadscales;
+ float temperature;
float probability;
float scale;
@@ -80,6 +93,9 @@
float *cost;
float *filters;
float *filter_updates;
+ float *state;
+
+ float *binary_filters;
float *biases;
float *bias_updates;
@@ -102,14 +118,28 @@
float * mean;
float * variance;
+ float * mean_delta;
+ float * variance_delta;
+
float * rolling_mean;
float * rolling_variance;
+ float * x;
+ float * x_norm;
+
+ struct layer *input_layer;
+ struct layer *self_layer;
+ struct layer *output_layer;
+
#ifdef GPU
int *indexes_gpu;
+ float * state_gpu;
float * filters_gpu;
float * filter_updates_gpu;
+ float *binary_filters_gpu;
+ float *mean_filters_gpu;
+
float * spatial_mean_gpu;
float * spatial_variance_gpu;
@@ -144,7 +174,7 @@
float * squared_gpu;
float * norms_gpu;
#endif
-} layer;
+};
void free_layer(layer);
--
Gitblit v1.10.0