Merge branch 'magikerwin1993-master'

peteryuX · Apr 28, 2020 · 97483c8 · 97483c8
2 parents 2986248 + 8cdd082
commit 97483c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -220,8 +220,8 @@ python test.py --cfg_path="./configs/retinaface_mbv2.yaml" --webcam=True --down_
 
 | Model Name          | Easy   | Medium | Hard   |
 |---------------------|--------|--------|--------|
-| Tensorflow2 MobileNetV2 | 93.35% | 91.78% | 79.51% |
-| Tensorflow2 ResNet50 | 94.84% | 93.95% | 83.38% |
+| Tensorflow2 MobileNetV2 | 93.23% | 91.74% | 80.01% |
+| Tensorflow2 ResNet50 | 94.21% | 93.25% | 83.55% |
 | [Pytorch ResNet50](https://github.com/biubug6/Pytorch_Retinaface) | 95.48% | 94.04% | 84.43% |
 | [Mxnet ResNet50 (Official)](https://github.com/deepinsight/insightface/tree/master/RetinaFace) | 94.97% | 93.89% | 82.27% |
 ****
@@ -235,12 +235,13 @@ Note:
 
 | Model Name          | Download Link |
 |---------------------|---------------|
-| Retinaface ResNet50 | [GoogleDrive](https://drive.google.com/file/d/1MgpOsJJRhm7tBDJ2lDlKyG3op7evivPd/view?usp=sharing) |
-| Retinaface MobileNetV2 | [GoogleDrive](https://drive.google.com/file/d/1Q8b2vBLafFOr5hy5i4MbgOAoa9tppl3A/view?usp=sharing) |
+| Retinaface ResNet50 | [GoogleDrive](https://drive.google.com/file/d/1qnuci2BVUNH3fqVqQYCoub4Wd2gShld9/view?usp=sharing) |
+| Retinaface MobileNetV2 | [GoogleDrive](https://drive.google.com/file/d/16HBH2bpSY3TQ_STryWFe72CIcUzp6GRy/view?usp=sharing) |
 
 Note:
 - After dowloading these models, extract them into `./checkpoints` for restoring.
 - All training settings of the models can be found in the corresponding [./configs/*.yaml](https://github.com/peteryuX/retinaface-tf2/tree/master/configs) files.
+- You can see the tensorboard traning logs in [here](https://tensorboard.dev/experiment/2Jr2OUjpS2CWr9SySPK2tQ/#scalars).
 
 ****
 

diff --git a/modules/models.py b/modules/models.py
@@ -116,7 +116,7 @@ def call(self, x):
         output2 = self.merge2(output2)
 
         up_h, up_w = tf.shape(output1)[1], tf.shape(output1)[2]
-        up2 = tf.image.resize(output3, [up_h, up_w], method='nearest')
+        up2 = tf.image.resize(output2, [up_h, up_w], method='nearest')
         output1 = output1 + up2
         output1 = self.merge1(output1)
 

diff --git a/notebooks/colab-github-demo.ipynb b/notebooks/colab-github-demo.ipynb
@@ -160,7 +160,7 @@
       "source": [
         "from google_drive_downloader import GoogleDriveDownloader as gdd\n",
         "\n",
-        "gdd.download_file_from_google_drive(file_id='1Q8b2vBLafFOr5hy5i4MbgOAoa9tppl3A',\n",
+        "gdd.download_file_from_google_drive(file_id='16HBH2bpSY3TQ_STryWFe72CIcUzp6GRy',\n",
         "                                    dest_path='./retinaface_mbv2.zip')\n",
         "!mkdir -p checkpoints/retinaface_mbv2\n",
         "!unzip retinaface_mbv2.zip -d checkpoints/retinaface_mbv2\n",
@@ -171,7 +171,7 @@
         {
           "output_type": "stream",
           "text": [
-            "Downloading 1Q8b2vBLafFOr5hy5i4MbgOAoa9tppl3A into ./retinaface_mbv2.zip... Done.\n",
+            "Downloading 16HBH2bpSY3TQ_STryWFe72CIcUzp6GRy into ./retinaface_mbv2.zip... Done.\n",
             "Archive:  retinaface_mbv2.zip\n",
             "  inflating: checkpoints/retinaface_mbv2/checkpoint  \n",
             "  inflating: checkpoints/retinaface_mbv2/ckpt-81.data-00000-of-00002  \n",