diff options
author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2017-02-16 16:30:53 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-16 16:30:53 -0800 |
commit | 25dfdfb5cff70601bbb77dc5606575b84c8f7141 (patch) | |
tree | 87bb677cb332b1c4775949893db0f46c191dfcc8 | |
parent | 4b653486a13e507188482758bbbfa8d71eb87343 (diff) | |
parent | fc8f3eba6fa06be2f55d1b576f46664e07f5d0a6 (diff) | |
download | caffeonacl-25dfdfb5cff70601bbb77dc5606575b84c8f7141.tar.gz caffeonacl-25dfdfb5cff70601bbb77dc5606575b84c8f7141.tar.bz2 caffeonacl-25dfdfb5cff70601bbb77dc5606575b84c8f7141.zip |
Merge pull request #4721 from kashefy/fix_matlab_demo_typos
fix comments in matlab classification demo
-rw-r--r-- | matlab/demo/classification_demo.m | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/matlab/demo/classification_demo.m b/matlab/demo/classification_demo.m index 2b603329..435c0778 100644 --- a/matlab/demo/classification_demo.m +++ b/matlab/demo/classification_demo.m @@ -8,7 +8,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu) % % **************************************************************************** % For detailed documentation and usage on Caffe's Matlab interface, please -% refer to Caffe Interface Tutorial at +% refer to the Caffe Interface Tutorial at % http://caffe.berkeleyvision.org/tutorial/interfaces.html#matlab % **************************************************************************** % @@ -24,6 +24,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu) % $ export LD_LIBRARY_PATH=/opt/intel/mkl/lib/intel64:/usr/local/cuda-5.5/lib64 % $ export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libstdc++.so.6 % Or the equivalent based on where things are installed on your system +% and what versions are installed. % % Usage: % im = imread('../../examples/images/cat.jpg'); @@ -39,7 +40,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu) % Data coming in from matlab needs to be in the order % [width, height, channels, images] % where width is the fastest dimension. -% Here is the rough matlab for putting image data into the correct +% Here is the rough matlab code for putting image data into the correct % format in W x H x C with BGR channels: % % permute channels from RGB to BGR % im_data = im(:, :, [3, 2, 1]); @@ -54,7 +55,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu) % If you have multiple images, cat them with cat(4, ...) -% Add caffe/matlab to you Matlab search PATH to use matcaffe +% Add caffe/matlab to your Matlab search PATH in order to use matcaffe if exist('../+caffe', 'dir') addpath('..'); else |