arrange example images, update paths, bring back imagenet_pretrained

justsz · Mar 19, 2014 · faccb9a · faccb9a
1 parent c193976
commit faccb9a
Show file tree

Hide file tree

Showing 5 changed files with 272 additions and 2 deletions.
diff --git a/examples/imagenet_pretrained.ipynb b/examples/imagenet_pretrained.ipynb
diff --git a/data/cat.jpg → examples/images/cat.jpg b/data/cat.jpg → examples/images/cat.jpg
diff --git a/examples/images/lena.png b/examples/images/lena.png
diff --git a/matlab/caffe/matcaffe_demo.m b/matlab/caffe/matcaffe_demo.m
@@ -16,7 +16,7 @@
 % Or the equivalent based on where things are installed on your system
 %
 % Usage:
-%  im = imread('../../examples/cat.jpg');
+%  im = imread('../../examples/images/cat.jpg');
 %  scores = matcaffe_demo(im, 1);
 %  [score, class] = max(scores);
 

diff --git a/src/caffe/test/test_images_layer.cpp b/src/caffe/test/test_images_layer.cpp
@@ -36,7 +36,7 @@ class ImagesLayerTest : public ::testing::Test {
     std::ofstream outfile(filename, std::ofstream::out);
     LOG(INFO) << "Using temporary file " << filename;
     for (int i = 0; i < 5; ++i) {
-      outfile << "data/cat.jpg " << i;
+      outfile << "examples/images/cat.jpg " << i;
     }
     outfile.close();
   }