From 34c0ab5878b460fabc5d43dde2c53f07a2b784d1 Mon Sep 17 00:00:00 2001 From: berak Date: Sun, 2 Jul 2017 10:09:27 +0200 Subject: [PATCH 1/2] dnn: fix some tutorial links --- modules/dnn/tutorials/tutorial_dnn_googlenet.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dnn/tutorials/tutorial_dnn_googlenet.markdown b/modules/dnn/tutorials/tutorial_dnn_googlenet.markdown index 2fdbccd7a5..83fef32f33 100644 --- a/modules/dnn/tutorials/tutorial_dnn_googlenet.markdown +++ b/modules/dnn/tutorials/tutorial_dnn_googlenet.markdown @@ -13,7 +13,7 @@ We will demonstrate results of this example on the following picture. Source Code ----------- -We will be using snippets from the example application, that can be downloaded [here](https://github.com/opencv/opencv/blob/master/modules/samples/dnn/caffe_googlenet.cpp). +We will be using snippets from the example application, that can be downloaded [here](https://github.com/opencv/opencv/blob/master/samples/dnn/caffe_googlenet.cpp). @include dnn/caffe_googlenet.cpp @@ -21,11 +21,11 @@ Explanation ----------- -# Firstly, download GoogLeNet model files: - [bvlc_googlenet.prototxt ](https://raw.githubusercontent.com/opencv/opencv/master/modules/samples/data/dnn/bvlc_googlenet.prototxt) and + [bvlc_googlenet.prototxt ](https://raw.githubusercontent.com/opencv/opencv/master/samples/data/dnn/bvlc_googlenet.prototxt) and [bvlc_googlenet.caffemodel](http://dl.caffe.berkeleyvision.org/bvlc_googlenet.caffemodel) Also you need file with names of [ILSVRC2012](http://image-net.org/challenges/LSVRC/2012/browse-synsets) classes: - [synset_words.txt](https://raw.githubusercontent.com/opencv/opencv/master/modules/samples/data/dnn/synset_words.txt). + [synset_words.txt](https://raw.githubusercontent.com/opencv/opencv/master/samples/data/dnn/synset_words.txt). Put these files into working dir of this program example. @@ -63,4 +63,4 @@ Explanation For our image we get: > Best class: #812 'space shuttle' > -> Probability: 99.6378% \ No newline at end of file +> Probability: 99.6378% From 32d1eb36dff769614cde40f38b250cb85c7bec15 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 3 Jul 2017 12:44:27 +0300 Subject: [PATCH 2/2] dnn: fix links --- modules/dnn/test/pascal_semsegm_test_fcn.py | 4 ++-- modules/dnn/tutorials/tutorial_dnn_halide.markdown | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dnn/test/pascal_semsegm_test_fcn.py b/modules/dnn/test/pascal_semsegm_test_fcn.py index 60b061ca37..d855786a36 100644 --- a/modules/dnn/test/pascal_semsegm_test_fcn.py +++ b/modules/dnn/test/pascal_semsegm_test_fcn.py @@ -204,9 +204,9 @@ if __name__ == "__main__": parser.add_argument("--val_names", help="path to file with validation set image names, download it here: " "https://github.com/shelhamer/fcn.berkeleyvision.org/blob/master/data/pascal/seg11valid.txt") parser.add_argument("--cls_file", help="path to file with colors for classes, download it here: " - "https://github.com/opencv/opencv/blob/master/modules/samples/data/dnn/pascal-classes.txt") + "https://github.com/opencv/opencv/blob/master/samples/data/dnn/pascal-classes.txt") parser.add_argument("--prototxt", help="path to caffe prototxt, download it here: " - "https://github.com/opencv/opencv/blob/master/modules/samples/data/dnn/fcn8s-heavy-pascal.prototxt") + "https://github.com/opencv/opencv/blob/master/samples/data/dnn/fcn8s-heavy-pascal.prototxt") parser.add_argument("--caffemodel", help="path to caffemodel file, download it here: " "http://dl.caffe.berkeleyvision.org/fcn8s-heavy-pascal.caffemodel") parser.add_argument("--log", help="path to logging file") diff --git a/modules/dnn/tutorials/tutorial_dnn_halide.markdown b/modules/dnn/tutorials/tutorial_dnn_halide.markdown index 4bd038d45f..a373a7f157 100644 --- a/modules/dnn/tutorials/tutorial_dnn_halide.markdown +++ b/modules/dnn/tutorials/tutorial_dnn_halide.markdown @@ -93,7 +93,7 @@ When you build OpenCV add the following configuration flags: Download Caffe model from SqueezeNet repository: [train_val.prototxt](https://github.com/DeepScale/SqueezeNet/blob/master/SqueezeNet_v1.1/train_val.prototxt) and [squeezenet_v1.1.caffemodel](https://github.com/DeepScale/SqueezeNet/blob/master/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel). Also you need file with names of [ILSVRC2012](http://image-net.org/challenges/LSVRC/2012/browse-synsets) classes: -[synset_words.txt](https://raw.githubusercontent.com/opencv/opencv/master/modules/samples/data/dnn/synset_words.txt). +[synset_words.txt](https://raw.githubusercontent.com/opencv/opencv/master/samples/data/dnn/synset_words.txt). Put these files into working dir of this program example.