From 5ef74c2031a040f30a670dc7d60790fc6a9ec720 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 May 2014 22:20:34 +0000
Subject: [PATCH] Slowly refactoring and pushing to GPU
---
src/tests.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/tests.c b/src/tests.c
index 5b77dcc..1c46b24 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -302,9 +302,9 @@
{
srand(444444);
srand(888888);
- network net = parse_network_cfg("cfg/nist_basic.cfg");
- data train = load_categorical_data_csv("mnist/mnist_train.csv", 0, 10);
- data test = load_categorical_data_csv("mnist/mnist_test.csv",0,10);
+ network net = parse_network_cfg("cfg/nist.cfg");
+ data train = load_categorical_data_csv("data/mnist/mnist_train.csv", 0, 10);
+ data test = load_categorical_data_csv("data/mnist/mnist_test.csv",0,10);
normalize_data_rows(train);
normalize_data_rows(test);
//randomize_data(train);
@@ -655,9 +655,7 @@
resize_network(net, im.h, im.w, im.c);
forward_network(net, im.data);
- image out = get_network_image(net);
visualize_network(net);
- cvWaitKey(1000);
cvWaitKey(0);
}
@@ -672,8 +670,6 @@
if (flip)sprintf(out_path, "%s%d/%s_r.txt",out_dir, interval, image_file);
else sprintf(out_path, "%s%d/%s.txt",out_dir, interval, image_file);
printf("%s\n", image_file);
- FILE *fp = fopen(out_path, "w");
- if(fp == 0) file_error(out_path);
IplImage* src = 0;
if( (src = cvLoadImage(image_path,-1)) == 0 ) file_error(image_path);
@@ -709,6 +705,8 @@
ims[j+interval] = features_output_size(net, src, ex_h, ex_w);
}
}
+ FILE *fp = fopen(out_path, "w");
+ if(fp == 0) file_error(out_path);
for(i = 0; i < max_scale+interval; ++i){
image out = ims[i];
fprintf(fp, "%d, %d, %d\n",out.c, out.h, out.w);
@@ -784,13 +782,13 @@
// test_im2row();
//test_split();
//test_ensemble();
- //test_nist();
+ test_nist();
//test_cifar10();
//test_vince();
//test_full();
//train_VOC();
- features_VOC_image(argv[1], argv[2], argv[3], 0);
- features_VOC_image(argv[1], argv[2], argv[3], 1);
+ //features_VOC_image(argv[1], argv[2], argv[3], 0);
+ //features_VOC_image(argv[1], argv[2], argv[3], 1);
//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");
--
Gitblit v1.10.0