summaryrefslogtreecommitdiff
path: root/matlab
diff options
context:
space:
mode:
authorSergio Guadarrama <sguada@gmail.com>2014-03-31 15:55:33 -0700
committerSergio Guadarrama <sguada@gmail.com>2014-03-31 15:55:33 -0700
commit5e79c95eac7ae81069f2c992ebbefc86499d714b (patch)
tree70879bdf720992e920913ccf4e9b57da7ee3dc79 /matlab
parent38e3d7ff3a2ef747733ec2bc88b871460ba9194d (diff)
downloadcaffeonacl-5e79c95eac7ae81069f2c992ebbefc86499d714b.tar.gz
caffeonacl-5e79c95eac7ae81069f2c992ebbefc86499d714b.tar.bz2
caffeonacl-5e79c95eac7ae81069f2c992ebbefc86499d714b.zip
Added default values to matcaffe_batch for testing
Diffstat (limited to 'matlab')
-rw-r--r--matlab/caffe/matcaffe_batch.m8
1 files changed, 7 insertions, 1 deletions
diff --git a/matlab/caffe/matcaffe_batch.m b/matlab/caffe/matcaffe_batch.m
index 386a022d..3cb7f144 100644
--- a/matlab/caffe/matcaffe_batch.m
+++ b/matlab/caffe/matcaffe_batch.m
@@ -16,14 +16,20 @@ function [scores,list_im] = matcaffe_batch(list_im, use_gpu)
% Or the equivalent based on where things are installed on your system
%
% Usage:
-% scores = matcaffe_batch({'peppers.png','onion.png'}, 0);
+% scores = matcaffe_batch({'peppers.png','onion.png'});
% scores = matcaffe_batch('list_images.txt', 1);
+if nargin < 1
+ % For test purposes
+ list_im = {'peppers.png','onions.png'};
+end
if ischar(list_im)
%Assume it is a file contaning the list of images
filename = list_im;
list_im = read_cell(filename);
end
+% Adjust the batch size to match with imagenet_deploy.prototxt
batch_size = 10;
+% Adjust dim to the output size of imagenet_deploy.prototxt
dim = 1000;
disp(list_im)
if mod(length(list_im),batch_size)