From 96b45fd0eb65c5d72df1a1cf86bacf5383fec232 Mon Sep 17 00:00:00 2001 From: Brandon Amos Date: Tue, 7 Feb 2017 13:43:42 -0500 Subject: [PATCH] Use https for the model downloads. --- .travis.yml | 2 +- demos/sphere.py | 2 +- docs/demo-4-sphere.md | 2 +- docs/models-and-accuracies.md | 8 ++++---- models/get-models.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a2ff1f..a7cd8e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ script: cd /root/src/openface; \ ./models/get-models.sh && \ ./data/download-lfw-subset.sh && \ - wget -nv http://cmusatyalab.org/openface-models/nn4.v1.t7 \ + wget -nv https://cmusatyalab.org/openface-models/nn4.v1.t7 \ -O ./models/openface/nn4.v1.t7 && \ python2 setup.py install && \ ./run-tests.sh" diff --git a/demos/sphere.py b/demos/sphere.py index 27f7ab8..c97ca7d 100755 --- a/demos/sphere.py +++ b/demos/sphere.py @@ -160,7 +160,7 @@ if __name__ == '__main__': help="Path to Torch network model.", default='nn4.small2.3d.v1.t7') # Download the 3D model from: - # http://storage.cmusatyalab.org/openface-models/nn4.small2.3d.v1.t7 + # https://storage.cmusatyalab.org/openface-models/nn4.small2.3d.v1.t7 parser.add_argument('--imgDim', type=int, help="Default image dimension.", default=96) parser.add_argument( diff --git a/docs/demo-4-sphere.md b/docs/demo-4-sphere.md index d430537..1196da6 100644 --- a/docs/demo-4-sphere.md +++ b/docs/demo-4-sphere.md @@ -77,6 +77,6 @@ To run this on your computer: 1. [Set up OpenFace](http://cmusatyalab.github.io/openface/setup/). 2. Download the 3D model from - [here](http://storage.cmusatyalab.org/openface-models/nn4.small2.3d.v1.t7). + [here](https://storage.cmusatyalab.org/openface-models/nn4.small2.3d.v1.t7). 3. Run [demos/sphere.py](https://github.com/cmusatyalab/openface/blob/master/demos/sphere.py) with the `--networkModel` argument pointing to the 3D model. diff --git a/docs/models-and-accuracies.md b/docs/models-and-accuracies.md index ff85fe2..ca74d8c 100644 --- a/docs/models-and-accuracies.md +++ b/docs/models-and-accuracies.md @@ -29,10 +29,10 @@ and [CASIA-WebFace](http://arxiv.org/abs/1411.7923). The models can be downloaded from our storage servers: -+ [nn4.v1](http://storage.cmusatyalab.org/openface-models/nn4.v1.t7) -+ [nn4.v2](http://storage.cmusatyalab.org/openface-models/nn4.v2.t7) -+ [nn4.small1.v1](http://storage.cmusatyalab.org/openface-models/nn4.small1.v1.t7) -+ [nn4.small2.v1](http://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7) ++ [nn4.v1](https://storage.cmusatyalab.org/openface-models/nn4.v1.t7) ++ [nn4.v2](https://storage.cmusatyalab.org/openface-models/nn4.v2.t7) ++ [nn4.small1.v1](https://storage.cmusatyalab.org/openface-models/nn4.small1.v1.t7) ++ [nn4.small2.v1](https://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7) API differences between the models are: diff --git a/models/get-models.sh b/models/get-models.sh index 7f4e749..249d714 100755 --- a/models/get-models.sh +++ b/models/get-models.sh @@ -43,12 +43,12 @@ if [ ! -f openface/nn4.small2.v1.t7 ]; then printf "====================================================\n\n" wget -nv \ - http://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7 \ + https://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7 \ -O openface/nn4.small2.v1.t7 [ $? -eq 0 ] || ( rm openface/nn4.small2.v1.t7* && die "+ nn4.small2.v1.t7: Error in wget." ) wget -nv \ - http://storage.cmusatyalab.org/openface-models/celeb-classifier.nn4.small2.v1.pkl \ + https://storage.cmusatyalab.org/openface-models/celeb-classifier.nn4.small2.v1.pkl \ -O openface/celeb-classifier.nn4.small2.v1.pkl [ $? -eq 0 ] || ( rm openface/celeb-classifier.nn4.small2.v1.pkl && \ die "+ celeb-classifier.nn4.small2.v1.pkl: Error in wget." )