From 8bf417078cd23d56521d1cc1b8ce1a4ac3bef194 Mon Sep 17 00:00:00 2001
From: chenhaozhe <chenhaozhe1@huawei.com>
Date: Tue, 9 Feb 2021 16:37:14 +0800
Subject: [PATCH] Add requirements and update config of num_ssd_boxes

---
 model_zoo/official/cv/ssd/Dockerfile                       | 6 ++++++
 model_zoo/official/cv/ssd/requirements.txt                 | 4 ++++
 model_zoo/official/cv/ssd/src/config.py                    | 7 +++++++
 model_zoo/official/cv/ssd/src/config_ssd300.py             | 1 -
 .../official/cv/ssd/src/config_ssd_mobilenet_v1_fpn.py     | 7 +++----
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 model_zoo/official/cv/ssd/Dockerfile
 create mode 100644 model_zoo/official/cv/ssd/requirements.txt

diff --git a/model_zoo/official/cv/ssd/Dockerfile b/model_zoo/official/cv/ssd/Dockerfile
new file mode 100644
index 00000000000..fcb31f207f2
--- /dev/null
+++ b/model_zoo/official/cv/ssd/Dockerfile
@@ -0,0 +1,6 @@
+ARG FROM_IMAGE_NAME
+FROM ${FROM_IMAGE_NAME}
+
+RUN apt install libgl1-mesa-glx -y
+COPY requirements.txt .
+RUN pip3.7 install -r requirements.txt
diff --git a/model_zoo/official/cv/ssd/requirements.txt b/model_zoo/official/cv/ssd/requirements.txt
new file mode 100644
index 00000000000..2c4dadeb527
--- /dev/null
+++ b/model_zoo/official/cv/ssd/requirements.txt
@@ -0,0 +1,4 @@
+pycocotools
+opencv-python
+xml-python
+Pillow
diff --git a/model_zoo/official/cv/ssd/src/config.py b/model_zoo/official/cv/ssd/src/config.py
index a9f0b59f931..9f89df9db15 100644
--- a/model_zoo/official/cv/ssd/src/config.py
+++ b/model_zoo/official/cv/ssd/src/config.py
@@ -27,3 +27,10 @@ config_map = {
 }
 
 config = config_map[using_model]
+
+if config.num_ssd_boxes == -1:
+    num = 0
+    h, w = config.img_shape
+    for i in range(len(config.steps)):
+        num += (h // config.steps[i]) * (w // config.steps[i]) * config.num_default[i]
+    config.num_ssd_boxes = num
diff --git a/model_zoo/official/cv/ssd/src/config_ssd300.py b/model_zoo/official/cv/ssd/src/config_ssd300.py
index f7b921150d3..036b70c01ea 100644
--- a/model_zoo/official/cv/ssd/src/config_ssd300.py
+++ b/model_zoo/official/cv/ssd/src/config_ssd300.py
@@ -21,7 +21,6 @@ config = ed({
     "model": "ssd300",
     "img_shape": [300, 300],
     "num_ssd_boxes": 1917,
-    "neg_pre_positive": 3,
     "match_threshold": 0.5,
     "nms_threshold": 0.6,
     "min_score": 0.1,
diff --git a/model_zoo/official/cv/ssd/src/config_ssd_mobilenet_v1_fpn.py b/model_zoo/official/cv/ssd/src/config_ssd_mobilenet_v1_fpn.py
index 8eb2452b8a4..86c5ea38f69 100644
--- a/model_zoo/official/cv/ssd/src/config_ssd_mobilenet_v1_fpn.py
+++ b/model_zoo/official/cv/ssd/src/config_ssd_mobilenet_v1_fpn.py
@@ -20,8 +20,7 @@ from easydict import EasyDict as ed
 config = ed({
     "model": "ssd_mobilenet_v1_fpn",
     "img_shape": [640, 640],
-    "num_ssd_boxes": 51150,
-    "neg_pre_positive": 3,
+    "num_ssd_boxes": -1,
     "match_threshold": 0.5,
     "nms_threshold": 0.6,
     "min_score": 0.1,
@@ -32,8 +31,8 @@ config = ed({
     "lr_init": 0.01333,
     "lr_end_rate": 0.0,
     "warmup_epochs": 2,
+    "weight_decay": 4e-5,
     "momentum": 0.9,
-    "weight_decay": 1.5e-4,
 
     # network
     "num_default": [6, 6, 6, 6, 6],
@@ -48,7 +47,7 @@ config = ed({
     "steps": (8, 16, 32, 64, 128),
     "prior_scaling": (0.1, 0.2),
     "gamma": 2.0,
-    "alpha": 0.75,
+    "alpha": 0.25,
     "num_addition_layers": 4,
     "use_anchor_generator": True,
     "use_global_norm": True,