Merge branch 'master' of https://github.com/AI-performance/embedded-a…

…i.bench
AI-performance · Sep 6, 2020 · 597793a · 597793a
2 parents eda3cf5 + 4e43a58
commit 597793a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/models/README.md b/models/README.md
@@ -17,6 +17,8 @@ Original model stored for embedded-ai.bench.
 |squeezenetv1.1| fp32 |caffe| [prototxt](https://raw.githubusercontent.com/DeepScale/SqueezeNet/master/SqueezeNet_v1.1/deploy.prototxt), [caffemodel](https://github.com/DeepScale/SqueezeNet/raw/master/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel) | [DeepScale/SqueezeNet](https://github.com/DeepScale/SqueezeNet/tree/master/SqueezeNet_v1.1) |
 |vgg16| fp32 |caffe| [prototxt](https://gist.githubusercontent.com/ksimonyan/211839e770f7b538e2d8/raw/0067c9b32f60362c74f4c445a080beed06b07eb3/VGG_ILSVRC_16_layers_deploy.prototxt), [caffemodel](http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_16_layers.caffemodel) | [ksimonyan](https://gist.github.com/ksimonyan/211839e770f7b538e2d8/) | 
 |mobilenetv1| fp32 |tensorflow| [tflite&pb](https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz) | [hosted_models](https://tensorflow.google.cn/lite/guide/hosted_models) | 
+|mobilenetv1_quant| int8 |tensorflow| [tflite&pb](https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224_quant.tgz) | [hosted_models](https://tensorflow.google.cn/lite/guide/hosted_models) | 
 |mobilenetv2| fp32 |tensorflow| [tflite&pb](https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/mobilenet_v2_1.0_224.tgz) | [hosted_models](https://tensorflow.google.cn/lite/guide/hosted_models)  | 
+|mobilenetv2_quant| int8 |tensorflow| [tflite&pb](https://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/mobilenet_v2_1.0_224_quant.tgz) | [hosted_models](https://tensorflow.google.cn/lite/guide/hosted_models)  | 
 |squeezenetv1.1| fp32 |tensorflow| [tflite&pb](https://storage.googleapis.com/download.tensorflow.org/models/tflite/model_zoo/upload_20180427/squeezenet_2018_04_27.tgz) | [hosted_models](https://tensorflow.google.cn/lite/guide/hosted_models) |
 |vgg16| fp32 |tensorflow| [vgg_16_2016_08_28.tar.gz](http://download.tensorflow.org/models/vgg_16_2016_08_28.tar.gz) | [tensorflow/models: Pre-trained Models](https://github.com/tensorflow/models/tree/master/research/slim#Pretrained) |
diff --git a/models/download.sh b/models/download.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -x
 
 #alias wget_enhance='wget -c'
 enable_quiet_wget=OFF
@@ -142,23 +142,27 @@ function rename_tensorflow_models() {
 
     # squeezenet
     tar -zxvf squeezenet_2018_04_27.tgz
-    mkdir tf_squeezenet_v1.1
-    mv squeeze* ./tf_squeezenet_v1.1
+    mkdir tf_squeezenetv1.1
+    mv squeeze* ./tf_squeezenetv1.1
+    cp tf_squeezenetv1.1/squeezenet.tflite tf_squeezenetv1.1/tf_squeezenetv1.1.tflite
 
     # mobilenetv1 quant
     tar -zxvf mobilenet_v1_1.0_224_quant.tgz
     mkdir tf_mobilenetv1_quant
     mv mobilenet_v1_1.0_224_quant* ./tf_mobilenetv1_quant
+    cp tf_mobilenetv1_quant/mobilenet_v1_1.0_224_quant.tflite tf_mobilenetv1_quant/tf_mobilenetv1_quant.tflite
 
     # mobilenetv2 quant
     tar -zxvf mobilenet_v2_1.0_224_quant.tgz
     mkdir tf_mobilenetv2_quant
     mv mobilenet_v2_1.0_224_quant* ./tf_mobilenetv2_quant
+    cp tf_mobilenetv2_quant/mobilenet_v2_1.0_224_quant.tflite tf_mobilenetv2_quant/tf_mobilenetv2_quant.tflite
 
     # mnasnet 1.0 224
-    tar -zxvf mnasnet_1.0_224_09_07_2018.tgz
-    mkdir tf_mnasnet_1.0_224
-    mv mnasnet* ./tf_mnasnet_1.0_224
+    # TODO(ysh329): something wrong with not completed tar file
+    #tar -zxvf mnasnet_1.0_224_09_07_2018.tgz
+    #mkdir tf_mnasnet_1.0_224
+    #mv mnasnet* ./tf_mnasnet_1.0_224
 }
 
 function prepare_tensorflow_models() {