From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic
---
src/network.h | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/network.h b/src/network.h
index c6c7790..d2fb346 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,15 +2,16 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include "opencl.h"
#include "image.h"
#include "data.h"
typedef enum {
CONVOLUTIONAL,
+ DECONVOLUTIONAL,
CONNECTED,
MAXPOOL,
SOFTMAX,
+ DETECTION,
NORMALIZATION,
DROPOUT,
FREEWEIGHT,
@@ -21,6 +22,7 @@
typedef struct {
int n;
int batch;
+ int seen;
float learning_rate;
float momentum;
float decay;
@@ -30,14 +32,16 @@
float *output;
#ifdef GPU
- cl_mem *input_cl;
- cl_mem *truth_cl;
+ float **input_gpu;
+ float **truth_gpu;
#endif
} network;
#ifdef GPU
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);
+float * get_network_delta_gpu_layer(network net, int i);
#endif
void compare_networks(network n1, network n2, data d);
@@ -45,7 +49,7 @@
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);
+void backward_network(network net, float *input, float *truth);
void update_network(network net);
float train_network(network net, data d);
--
Gitblit v1.10.0