From 0816a9480351b5def27c28c7de102a18fb71fdb9 Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Thu, 13 Mar 2014 20:13:46 -0700 Subject: [PATCH] fix wrapper example paths --- matlab/caffe/matcaffe_demo.m | 6 +++--- python/caffe/detection/detector.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/matlab/caffe/matcaffe_demo.m b/matlab/caffe/matcaffe_demo.m index 3eb4f10..459fef9 100644 --- a/matlab/caffe/matcaffe_demo.m +++ b/matlab/caffe/matcaffe_demo.m @@ -1,6 +1,6 @@ function scores = matcaffe_demo(im, use_gpu) % scores = matcaffe_demo(im, use_gpu) -% +% % Demo of the matlab wrapper using the ILSVRC network. % % input @@ -20,9 +20,9 @@ function scores = matcaffe_demo(im, use_gpu) % scores = matcaffe_demo(im, 1); % [score, class] = max(scores); -model_def_file = '../../examples/imagenet_deploy.prototxt'; +model_def_file = '../../models/imagenet.prototxt'; % NOTE: you'll have to get the pre-trained ILSVRC network -model_file = '../../examples/alexnet_train_iter_470000'; +model_file = '../../models/caffe_reference_imagenet_model'; % init caffe network (spews logging info) caffe('init', model_def_file, model_file); diff --git a/python/caffe/detection/detector.py b/python/caffe/detection/detector.py index 1dcb797..b732836 100644 --- a/python/caffe/detection/detector.py +++ b/python/caffe/detection/detector.py @@ -371,12 +371,12 @@ if __name__ == "__main__": # Optional arguments. parser.add_argument( "--model_def", - default="examples/imagenet_deploy.prototxt", + default="../../../models/imagenet.prototxt", help="Model definition file." ) parser.add_argument( "--pretrained_model", - default="examples/caffe_reference_imagenet_model", + default="../../../models/caffe_reference_imagenet_model", help="Trained model weights file." ) parser.add_argument( -- 2.7.4