From 972b00d814528a3af8cf81d1d91f35bf7f195eaf Mon Sep 17 00:00:00 2001 From: Leo Vandriel Date: Mon, 25 Sep 2017 22:21:30 -0700 Subject: [PATCH] fix alexnet and googlenet download --- include/caffe2/zoo/keeper.h | 20 +++++++++++--------- script/download_extra.sh | 8 ++++---- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/caffe2/zoo/keeper.h b/include/caffe2/zoo/keeper.h index 5160295e..e6749803 100644 --- a/include/caffe2/zoo/keeper.h +++ b/include/caffe2/zoo/keeper.h @@ -18,26 +18,28 @@ const std::map> 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 index f6441115..4d460738 100755 --- 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