From b32a287e38f4c6a41828f18b4669dec9f3af4943 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:17:52 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/image.c | 1 +
src/data.c | 1 +
src/cnn.c | 6 ++++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/cnn.c b/src/cnn.c
index 0acc842..cac1149 100644
--- a/src/cnn.c
+++ b/src/cnn.c
@@ -655,9 +655,8 @@
cvWaitKey(0);
}
-void features_VOC_image(char *image_file, char *image_dir, char *out_dir, int flip)
+void features_VOC_image(char *image_file, char *image_dir, char *out_dir, int flip, int interval)
{
- int interval = 4;
int i,j;
network net = parse_network_cfg("cfg/voc_imagenet.cfg");
char image_path[1024];
@@ -785,6 +784,9 @@
//tune_VOC();
//features_VOC_image(argv[1], argv[2], argv[3], 0);
//features_VOC_image(argv[1], argv[2], argv[3], 1);
+ //train_VOC();
+ //features_VOC_image(argv[1], argv[2], argv[3], 0, 4);
+ //features_VOC_image(argv[1], argv[2], argv[3], 1, 4);
//features_VOC_image_size(argv[1], atoi(argv[2]), atoi(argv[3]));
//visualize_imagenet_features("data/assira/train.list");
//visualize_imagenet_topk("data/VOC2012.list");
diff --git a/src/data.c b/src/data.c
index a2432af..30ee9ec 100644
--- a/src/data.c
+++ b/src/data.c
@@ -37,6 +37,7 @@
d.shallow = 0;
d.X.rows = n;
d.X.vals = calloc(d.X.rows, sizeof(float*));
+ d.X.cols = 0;
d.y = make_matrix(n, k);
for(i = 0; i < n; ++i){
diff --git a/src/image.c b/src/image.c
index 453919f..e2c451b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -199,6 +199,7 @@
image make_empty_image(int h, int w, int c)
{
image out;
+ out.data = 0;
out.h = h;
out.w = w;
out.c = c;
--
Gitblit v1.10.0