From 6d56c38e8bcb9041335b03f27c192c24dfaedb1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 23:39:28 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/network.h | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/network.h b/src/network.h
index 67f93f7..d7f86c1 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,8 +2,14 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include "image.h"
+#include <stdint.h>
#include "layer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "image.h"
#include "data.h"
#include "tree.h"
@@ -15,7 +21,7 @@
float *workspace;
int n;
int batch;
- int *seen;
+ int *seen;
float epoch;
int subdivisions;
float momentum;
@@ -37,6 +43,11 @@
int num_steps;
int burn_in;
+ int adam;
+ float B1;
+ float B2;
+ float eps;
+
int inputs;
int h, w, c;
int max_crop;
@@ -53,6 +64,11 @@
#ifdef GPU
float **input_gpu;
float **truth_gpu;
+ float **input16_gpu;
+ float **output16_gpu;
+ size_t *max_input16_size;
+ size_t *max_output16_size;
+ int wait_stream;
#endif
} network;
@@ -116,9 +132,14 @@
void set_batch_network(network *net, int b);
int get_network_input_size(network net);
float get_network_cost(network net);
+detection *get_network_boxes(network *net, int w, int h, float thresh, float hier, int *map, int relative, int *num, int letter);
int get_network_nuisance(network net);
int get_network_background(network net);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
Gitblit v1.10.0