From 1a35f49ab3ae9d74b636de8580e07ab072846ea9 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 31 May 2018 11:19:42 +0000
Subject: [PATCH] Merge pull request #950 from IlyaOvodov/Fix_size_PR
---
src/layer.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index 341e58a..8a58c92 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -33,7 +33,10 @@
NETWORK,
XNOR,
REGION,
+ YOLO,
REORG,
+ UPSAMPLE,
+ REORG_OLD,
BLANK
} LAYER_TYPE;
@@ -41,6 +44,18 @@
SSE, MASKED, SMOOTH
} COST_TYPE;
+typedef struct {
+ int batch;
+ float learning_rate;
+ float momentum;
+ float decay;
+ int adam;
+ float B1;
+ float B2;
+ float eps;
+ int t;
+} update_args;
+
struct layer{
LAYER_TYPE type;
ACTIVATION activation;
@@ -67,6 +82,7 @@
int size;
int side;
int stride;
+ int reverse;
int pad;
int sqrt;
int flip;
@@ -82,6 +98,7 @@
float exposure;
float shift;
float ratio;
+ int focal_loss;
int softmax;
int classes;
int coords;
@@ -93,8 +110,23 @@
int noadjust;
int reorg;
int log;
+ int tanh;
+ int *mask;
+ int total;
+ float bflops;
+
+ int adam;
+ float B1;
+ float B2;
+ float eps;
+ float *m_gpu;
+ float *v_gpu;
+ int t;
+ float *m;
+ float *v;
tree *softmax_tree;
+ int *map;
float alpha;
float beta;
@@ -103,9 +135,19 @@
float coord_scale;
float object_scale;
float noobject_scale;
+ float mask_scale;
float class_scale;
+ int bias_match;
int random;
+ float ignore_thresh;
+ float truth_thresh;
+ float thresh;
+ float focus;
+ int classfix;
+ int absolute;
+ int onlyforward;
+ int stopbackward;
int dontload;
int dontloadscales;
@@ -223,6 +265,9 @@
float * weights_gpu;
float * weight_updates_gpu;
+ float * weights_gpu16;
+ float * weight_updates_gpu16;
+
float * biases_gpu;
float * bias_updates_gpu;
@@ -237,6 +282,7 @@
#ifdef CUDNN
cudnnTensorDescriptor_t srcTensorDesc, dstTensorDesc;
cudnnTensorDescriptor_t dsrcTensorDesc, ddstTensorDesc;
+ cudnnTensorDescriptor_t normTensorDesc, normDstTensorDesc, normDstTensorDescF16;
cudnnFilterDescriptor_t weightDesc;
cudnnFilterDescriptor_t dweightDesc;
cudnnConvolutionDescriptor_t convDesc;
--
Gitblit v1.10.0