From c521f87c9eb3ee70258f315ad0d72d7cf174e8b7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 25 May 2015 18:53:10 +0000
Subject: [PATCH] ?
---
src/network.h | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/network.h b/src/network.h
index 66873d2..9a8033c 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,33 +3,25 @@
#define NETWORK_H
#include "image.h"
+#include "detection_layer.h"
+#include "layer.h"
#include "data.h"
-typedef enum {
- CONVOLUTIONAL,
- DECONVOLUTIONAL,
- CONNECTED,
- MAXPOOL,
- SOFTMAX,
- NORMALIZATION,
- DROPOUT,
- FREEWEIGHT,
- CROP,
- COST
-} LAYER_TYPE;
-
typedef struct {
int n;
int batch;
int seen;
+ int subdivisions;
float learning_rate;
float momentum;
float decay;
- void **layers;
- LAYER_TYPE *types;
+ layer *layers;
int outputs;
float *output;
+ int inputs;
+ int h, w, c;
+
#ifdef GPU
float **input_gpu;
float **truth_gpu;
@@ -41,14 +33,15 @@
float *network_predict_gpu(network net, float *input);
float * get_network_output_gpu_layer(network net, int i);
float * get_network_delta_gpu_layer(network net, int i);
+float *get_network_output_gpu(network net);
#endif
void compare_networks(network n1, network n2, data d);
char *get_layer_string(LAYER_TYPE a);
-network make_network(int n, int batch);
-void forward_network(network net, float *input, float *truth, int train);
-void backward_network(network net, float *input);
+network make_network(int n);
+void forward_network(network net, network_state state);
+void backward_network(network net, network_state state);
void update_network(network net);
float train_network(network net, data d);
@@ -74,9 +67,12 @@
void visualize_network(network net);
int resize_network(network net, int h, int w, int c);
void set_batch_network(network *net, int b);
-void set_learning_network(network *net, float rate, float momentum, float decay);
int get_network_input_size(network net);
float get_network_cost(network net);
+detection_layer get_network_detection_layer(network net);
+
+int get_network_nuisance(network net);
+int get_network_background(network net);
#endif
--
Gitblit v1.10.0