summaryrefslogtreecommitdiff
path: root/matlab
diff options
context:
space:
mode:
authorSergey Karayev <sergeykarayev@gmail.com>2014-09-04 01:08:19 +0100
committerSergey Karayev <sergeykarayev@gmail.com>2014-09-04 03:59:14 +0100
commitda715ea07af8ea42487d333e3441d138320da36a (patch)
tree67343cbf6e317d0ad4a50d0961db1d4e081911c4 /matlab
parentd5e9739e5261de5f30832c06d849da5265bc95c6 (diff)
downloadcaffeonacl-da715ea07af8ea42487d333e3441d138320da36a.tar.gz
caffeonacl-da715ea07af8ea42487d333e3441d138320da36a.tar.bz2
caffeonacl-da715ea07af8ea42487d333e3441d138320da36a.zip
removed mention of getting_pretrained_models page and old paths
Diffstat (limited to 'matlab')
-rw-r--r--matlab/caffe/matcaffe_batch.m3
-rw-r--r--matlab/caffe/matcaffe_init.m4
2 files changed, 3 insertions, 4 deletions
diff --git a/matlab/caffe/matcaffe_batch.m b/matlab/caffe/matcaffe_batch.m
index 3cb7f144..f6d1aa83 100644
--- a/matlab/caffe/matcaffe_batch.m
+++ b/matlab/caffe/matcaffe_batch.m
@@ -27,9 +27,8 @@ if ischar(list_im)
filename = list_im;
list_im = read_cell(filename);
end
-% Adjust the batch size to match with imagenet_deploy.prototxt
+% Adjust the batch size and dim to match with models/bvlc_reference_caffenet/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)
diff --git a/matlab/caffe/matcaffe_init.m b/matlab/caffe/matcaffe_init.m
index 4e4ef8bf..7cc69357 100644
--- a/matlab/caffe/matcaffe_init.m
+++ b/matlab/caffe/matcaffe_init.m
@@ -8,11 +8,11 @@ if nargin < 1
end
if nargin < 2 || isempty(model_def_file)
% By default use imagenet_deploy
- model_def_file = '../../examples/imagenet/imagenet_deploy.prototxt';
+ model_def_file = '../../models/bvlc_reference_caffenet/deploy.prototxt';
end
if nargin < 3 || isempty(model_file)
% By default use caffe reference model
- model_file = '../../examples/imagenet/caffe_reference_imagenet_model';
+ model_file = '../../models/bvlc_reference_caffenet/bvlc_reference_caffenet.caffemodel';
end