fix alexnet and googlenet download

leovandriel · Sep 26, 2017 · 972b00d · 972b00d
1 parent e9bee17
commit 972b00d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/include/caffe2/zoo/keeper.h b/include/caffe2/zoo/keeper.h
@@ -18,26 +18,28 @@ const std::map<std::string, std::map<std::string, std::string>>
     keeper_model_lookup{
         {"alexnet",
          {{"res/alexnet_predict_net.pb",
-           "https://s3.amazonaws.com/caffe2/models/bvlc_alexnet/"
-           "predict_net.pb"},
+           "https://github.com/leonardvandriel/caffe2_models/raw/master/model/"
+           "alexnet_predict_net.pb"},
           {"res/alexnet_init_net.pb",
-           "https://s3.amazonaws.com/caffe2/models/bvlc_alexnet/init_net.pb"}}},
+           "https://github.com/leonardvandriel/caffe2_models/raw/master/model/"
+           "alexnet_init_net.pb"}}},
         {"googlenet",
          {
              {"res/googlenet_predict_net.pb",
-              "https://s3.amazonaws.com/caffe2/models/bvlc_googlenet/"
-              "predict_net.pb"},
+              "https://github.com/leonardvandriel/caffe2_models/raw/master/"
+              "model/googlenet_predict_net.pb"},
              {"res/googlenet_init_net.pb",
-              "https://s3.amazonaws.com/caffe2/models/bvlc_googlenet/"
-              "init_net.pb"},
+              "https://github.com/leonardvandriel/caffe2_models/raw/master/"
+              "model/googlenet_init_net.pb"},
          }},
         {"squeezenet",
          {
              {"res/squeezenet_predict_net.pb",
-              "https://s3.amazonaws.com/caffe2/models/squeezenet/"
+              "https://github.com/caffe2/models/raw/master/squeezenet/"
               "predict_net.pb"},
              {"res/squeezenet_init_net.pb",
-              "https://s3.amazonaws.com/caffe2/models/squeezenet/init_net.pb"},
+              "https://github.com/caffe2/models/raw/master/squeezenet/"
+              "init_net.pb"},
          }},
         {"vgg16",
          {{"res/vgg16_predict_net.pb",

diff --git a/script/download_extra.sh b/script/download_extra.sh
@@ -5,12 +5,12 @@ set -e
 mkdir -p res
 
 test -f res/alexnet_init_net.pb || echo "downloading AlexNet model (2)"
-test -f res/alexnet_predict_net.pb || curl --progress-bar --location --output res/alexnet_predict_net.pb https://github.com/caffe2/models/raw/master/bvlc_alexnet/predict_net.pb
-test -f res/alexnet_init_net.pb || curl --progress-bar --location --output res/alexnet_init_net.pb https://github.com/caffe2/models/raw/master/bvlc_alexnet/exec_net.pb
+test -f res/alexnet_predict_net.pb || curl --progress-bar --location --output res/alexnet_predict_net.pb https://github.com/leonardvandriel/caffe2_models/raw/master/model/alexnet_predict_net.pb
+test -f res/alexnet_init_net.pb || curl --progress-bar --location --output res/alexnet_init_net.pb https://github.com/leonardvandriel/caffe2_models/raw/master/model/alexnet_init_net.pb
 
 test -f res/googlenet_init_net.pb || echo "downloading GoogleNet model (2)"
-test -f res/googlenet_predict_net.pb || curl --progress-bar --location --output res/googlenet_predict_net.pb https://github.com/caffe2/models/raw/master/bvlc_googlenet/predict_net.pb
-test -f res/googlenet_init_net.pb || curl --progress-bar --location --output res/googlenet_init_net.pb https://github.com/caffe2/models/raw/master/bvlc_googlenet/exec_net.pb
+test -f res/googlenet_predict_net.pb || curl --progress-bar --location --output res/googlenet_predict_net.pb https://github.com/leonardvandriel/caffe2_models/raw/master/model/googlenet_predict_net.pb
+test -f res/googlenet_init_net.pb || curl --progress-bar --location --output res/googlenet_init_net.pb https://github.com/leonardvandriel/caffe2_models/raw/master/model/googlenet_init_net.pb
 
 test -f res/squeezenet_init_net.pb || echo "downloading SqueezeNet model (2)"
 test -f res/squeezenet_predict_net.pb || curl --progress-bar --location --output res/squeezenet_predict_net.pb https://github.com/caffe2/models/raw/master/squeezenet/predict_net.pb