From b4b729a15e577c68f64e0ac69fb299de6f5f706c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Apr 2014 16:58:24 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/convolutional_layer.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 8ca69b1..7404def 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -5,6 +5,7 @@
#include "activations.h"
typedef struct {
+ int batch;
int h,w,c;
int n;
int size;
@@ -24,11 +25,12 @@
ACTIVATION activation;
} convolutional_layer;
-convolutional_layer *make_convolutional_layer(int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
+convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
+void resize_convolutional_layer(convolutional_layer *layer, int h, int w, int c);
void forward_convolutional_layer(const convolutional_layer layer, float *in);
void learn_convolutional_layer(convolutional_layer layer);
void update_convolutional_layer(convolutional_layer layer, float step, float momentum, float decay);
-void visualize_convolutional_layer(convolutional_layer layer, char *window);
+image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
void backward_convolutional_layer(convolutional_layer layer, float *delta);
--
Gitblit v1.10.0