From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/network.h | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/network.h b/src/network.h
index ed8872b..b684d33 100644
--- a/src/network.h
+++ b/src/network.h
@@ -4,22 +4,9 @@
#include "image.h"
#include "detection_layer.h"
-#include "params.h"
+#include "layer.h"
#include "data.h"
-typedef enum {
- CONVOLUTIONAL,
- DECONVOLUTIONAL,
- CONNECTED,
- MAXPOOL,
- SOFTMAX,
- DETECTION,
- NORMALIZATION,
- DROPOUT,
- CROP,
- COST
-} LAYER_TYPE;
-
typedef struct {
int n;
int batch;
@@ -28,8 +15,7 @@
float learning_rate;
float momentum;
float decay;
- void **layers;
- LAYER_TYPE *types;
+ layer *layers;
int outputs;
float *output;
@@ -47,6 +33,9 @@
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);
+void forward_network_gpu(network net, network_state state);
+void backward_network_gpu(network net, network_state state);
#endif
void compare_networks(network n1, network n2, data d);
@@ -78,11 +67,11 @@
int get_predicted_class_network(network net);
void print_network(network net);
void visualize_network(network net);
-int resize_network(network net, int h, int w, int c);
+int resize_network(network *net, int w, int h);
void set_batch_network(network *net, int b);
int get_network_input_size(network net);
float get_network_cost(network net);
-detection_layer *get_network_detection_layer(network net);
+detection_layer get_network_detection_layer(network net);
int get_network_nuisance(network net);
int get_network_background(network net);
--
Gitblit v1.10.0