From a2f3644e87c11c222f86aa2aeb0e31d858ebb024 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 21 Apr 2018 20:56:46 +0000
Subject: [PATCH] Merge pull request #675 from IlyaOvodov/Flip_Fix
---
src/layer.h | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index 9bf6057..81e27ad 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -33,7 +33,9 @@
NETWORK,
XNOR,
REGION,
+ YOLO,
REORG,
+ UPSAMPLE,
REORG_OLD,
BLANK
} LAYER_TYPE;
@@ -42,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;
@@ -64,7 +78,6 @@
int out_h, out_w, out_c;
int n;
int max_boxes;
- int small_object;
int groups;
int size;
int side;
@@ -85,6 +98,7 @@
float exposure;
float shift;
float ratio;
+ int focal_loss;
int softmax;
int classes;
int coords;
@@ -96,6 +110,9 @@
int noadjust;
int reorg;
int log;
+ int tanh;
+ int *mask;
+ int total;
int adam;
float B1;
@@ -117,10 +134,14 @@
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;
@@ -260,6 +281,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