From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth
---
src/layer.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/layer.h b/src/layer.h
index 5291df9..8a58c92 100644
--- a/src/layer.h
+++ b/src/layer.h
@@ -78,7 +78,6 @@
int out_h, out_w, out_c;
int n;
int max_boxes;
- int small_object;
int groups;
int size;
int side;
@@ -114,6 +113,7 @@
int tanh;
int *mask;
int total;
+ float bflops;
int adam;
float B1;
@@ -135,6 +135,7 @@
float coord_scale;
float object_scale;
float noobject_scale;
+ float mask_scale;
float class_scale;
int bias_match;
int random;
@@ -281,7 +282,7 @@
#ifdef CUDNN
cudnnTensorDescriptor_t srcTensorDesc, dstTensorDesc;
cudnnTensorDescriptor_t dsrcTensorDesc, ddstTensorDesc;
- cudnnTensorDescriptor_t normTensorDesc;
+ cudnnTensorDescriptor_t normTensorDesc, normDstTensorDesc, normDstTensorDescF16;
cudnnFilterDescriptor_t weightDesc;
cudnnFilterDescriptor_t dweightDesc;
cudnnConvolutionDescriptor_t convDesc;
--
Gitblit v1.10.0