From a723e1c62a27aeb39aaf7fcdeb3beb4e89fba32d Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 15 Aug 2018 20:52:09 +0000
Subject: [PATCH] Merge pull request #766 from HotChick91/AlexeyAB-mask
---
src/layer.h | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index 285abe3..bd8518a 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;
@@ -83,6 +98,7 @@
float exposure;
float shift;
float ratio;
+ int focal_loss;
int softmax;
int classes;
int coords;
@@ -94,6 +110,10 @@
int noadjust;
int reorg;
int log;
+ int tanh;
+ int *mask;
+ int total;
+ float bflops;
int adam;
float B1;
@@ -115,10 +135,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;
@@ -155,6 +179,10 @@
float *weights;
float *weight_updates;
+ char *align_bit_weights;
+ float *mean_arr;
+ int lda_align;
+
float *col_image;
int * input_layers;
int * input_sizes;
@@ -241,6 +269,9 @@
float * weights_gpu;
float * weight_updates_gpu;
+ float * weights_gpu16;
+ float * weight_updates_gpu16;
+
float * biases_gpu;
float * bias_updates_gpu;
@@ -255,6 +286,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