From 0305fb4d99cf1efc7d4aa4d2ee2d65d54500d437 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 19:48:01 +0000
Subject: [PATCH] Some changes

---
 src/layer.h |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/layer.h b/src/layer.h
index a591f03..b3ab627 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -13,7 +13,10 @@
     DROPOUT,
     CROP,
     ROUTE,
-    COST
+    COST,
+    NORMALIZATION,
+    AVGPOOL,
+    LOCAL
 } LAYER_TYPE;
 
 typedef enum{
@@ -24,22 +27,30 @@
     LAYER_TYPE type;
     ACTIVATION activation;
     COST_TYPE cost_type;
+    int batch_normalize;
     int batch;
+    int forced;
     int inputs;
     int outputs;
+    int truths;
     int h,w,c;
     int out_h, out_w, out_c;
     int n;
     int groups;
     int size;
+    int side;
     int stride;
     int pad;
     int crop_width;
     int crop_height;
+    int sqrt;
     int flip;
     float angle;
+    float jitter;
     float saturation;
     float exposure;
+    float shift;
+    int softmax;
     int classes;
     int coords;
     int background;
@@ -47,11 +58,23 @@
     int objectness;
     int does_cost;
     int joint;
+    int noadjust;
+
+    float alpha;
+    float beta;
+    float kappa;
+
+    float coord_scale;
+    float object_scale;
+    float noobject_scale;
+    float class_scale;
 
     int dontload;
+    int dontloadscales;
 
     float probability;
     float scale;
+
     int *indexes;
     float *rand;
     float *cost;
@@ -61,6 +84,9 @@
     float *biases;
     float *bias_updates;
 
+    float *scales;
+    float *scale_updates;
+
     float *weights;
     float *weight_updates;
 
@@ -69,24 +95,57 @@
     int   * input_sizes;
     float * delta;
     float * output;
+    float * squared;
+    float * norms;
+
+    float * spatial_mean;
+    float * mean;
+    float * variance;
+
+    float * rolling_mean;
+    float * rolling_variance;
 
     #ifdef GPU
     int *indexes_gpu;
     float * filters_gpu;
     float * filter_updates_gpu;
 
+    float * spatial_mean_gpu;
+    float * spatial_variance_gpu;
+
+    float * mean_gpu;
+    float * variance_gpu;
+
+    float * rolling_mean_gpu;
+    float * rolling_variance_gpu;
+
+    float * spatial_mean_delta_gpu;
+    float * spatial_variance_delta_gpu;
+
+    float * variance_delta_gpu;
+    float * mean_delta_gpu;
+
     float * col_image_gpu;
 
+    float * x_gpu;
+    float * x_norm_gpu;
     float * weights_gpu;
-    float * biases_gpu;
-
     float * weight_updates_gpu;
+
+    float * biases_gpu;
     float * bias_updates_gpu;
 
+    float * scales_gpu;
+    float * scale_updates_gpu;
+
     float * output_gpu;
     float * delta_gpu;
     float * rand_gpu;
+    float * squared_gpu;
+    float * norms_gpu;
     #endif
 } layer;
 
+void free_layer(layer);
+
 #endif

--
Gitblit v1.10.0