From 1d264dcb2bc25ad78f4331b2e9f642569ba1fa8f Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 28 Dec 2017 12:55:05 +0000
Subject: [PATCH] Merge pull request #328 from Adesun/EOL
---
src/network.h | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/network.h b/src/network.h
index b7ba39c..49a2af2 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,9 +2,16 @@
#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"
typedef enum {
CONSTANT, STEP, EXP, POLY, STEPS, SIG, RANDOM
@@ -14,7 +21,7 @@
float *workspace;
int n;
int batch;
- int *seen;
+ int *seen;
float epoch;
int subdivisions;
float momentum;
@@ -36,16 +43,23 @@
int num_steps;
int burn_in;
+ int adam;
+ float B1;
+ float B2;
+ float eps;
+
int inputs;
int h, w, c;
int max_crop;
int min_crop;
float angle;
+ float aspect;
float exposure;
float saturation;
float hue;
int gpu_index;
+ tree *hierarchy;
#ifdef GPU
float **input_gpu;
@@ -64,6 +78,8 @@
} network_state;
#ifdef GPU
+float train_networks(network *nets, int n, data d, int interval);
+void sync_nets(network *nets, int n, int interval);
float train_network_datum_gpu(network net, float *x, float *y);
float *network_predict_gpu(network net, float *input);
float * get_network_output_gpu_layer(network net, int i);
@@ -115,5 +131,9 @@
int get_network_nuisance(network net);
int get_network_background(network net);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
Gitblit v1.10.0