From 84b083465965a5c84f375ad96e8f006c7fb62337 Mon Sep 17 00:00:00 2001
From: chengxianbin <chengxianbin@huawei.com>
Date: Wed, 17 Jun 2020 11:46:23 +0800
Subject: [PATCH] yolov3 network directory rectification

---
 {example/yolov3_coco2017 => model_zoo/yolov3}/README.md   | 0
 {example/yolov3_coco2017 => model_zoo/yolov3}/eval.py     | 8 ++++----
 .../yolov3/scripts}/run_distribute_train.sh               | 8 ++++++--
 .../yolov3/scripts}/run_eval.sh                           | 3 +++
 .../yolov3/scripts}/run_standalone_train.sh               | 3 +++
 .../yolov3_coco2017 => model_zoo/yolov3/src}/config.py    | 2 +-
 .../yolov3_coco2017 => model_zoo/yolov3/src}/dataset.py   | 2 +-
 .../util.py => model_zoo/yolov3/src/utils.py              | 2 +-
 {mindspore/model_zoo => model_zoo/yolov3/src}/yolov3.py   | 0
 {example/yolov3_coco2017 => model_zoo/yolov3}/train.py    | 6 +++---
 10 files changed, 22 insertions(+), 12 deletions(-)
 rename {example/yolov3_coco2017 => model_zoo/yolov3}/README.md (100%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3}/eval.py (95%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3/scripts}/run_distribute_train.sh (94%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3/scripts}/run_eval.sh (94%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3/scripts}/run_standalone_train.sh (96%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3/src}/config.py (98%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3/src}/dataset.py (99%)
 rename example/yolov3_coco2017/util.py => model_zoo/yolov3/src/utils.py (99%)
 rename {mindspore/model_zoo => model_zoo/yolov3/src}/yolov3.py (100%)
 rename {example/yolov3_coco2017 => model_zoo/yolov3}/train.py (97%)

diff --git a/example/yolov3_coco2017/README.md b/model_zoo/yolov3/README.md
similarity index 100%
rename from example/yolov3_coco2017/README.md
rename to model_zoo/yolov3/README.md
diff --git a/example/yolov3_coco2017/eval.py b/model_zoo/yolov3/eval.py
similarity index 95%
rename from example/yolov3_coco2017/eval.py
rename to model_zoo/yolov3/eval.py
index 6e6d3582482..433ae834ba3 100644
--- a/example/yolov3_coco2017/eval.py
+++ b/model_zoo/yolov3/eval.py
@@ -19,10 +19,10 @@ import argparse
 import time
 from mindspore import context, Tensor
 from mindspore.train.serialization import load_checkpoint, load_param_into_net
-from mindspore.model_zoo.yolov3 import yolov3_resnet18, YoloWithEval
-from dataset import create_yolo_dataset, data_to_mindrecord_byte_image
-from config import ConfigYOLOV3ResNet18
-from util import metrics
+from src.yolov3 import yolov3_resnet18, YoloWithEval
+from src.dataset import create_yolo_dataset, data_to_mindrecord_byte_image
+from src.config import ConfigYOLOV3ResNet18
+from src.utils import metrics
 
 def yolo_eval(dataset_path, ckpt_path):
     """Yolov3 evaluation."""
diff --git a/example/yolov3_coco2017/run_distribute_train.sh b/model_zoo/yolov3/scripts/run_distribute_train.sh
similarity index 94%
rename from example/yolov3_coco2017/run_distribute_train.sh
rename to model_zoo/yolov3/scripts/run_distribute_train.sh
index 0b764419d2c..eeda5077e94 100644
--- a/example/yolov3_coco2017/run_distribute_train.sh
+++ b/model_zoo/yolov3/scripts/run_distribute_train.sh
@@ -45,6 +45,9 @@ echo "After running the scipt, the network runs in the background. The log will
 export MINDSPORE_HCCL_CONFIG_PATH=$6
 export RANK_SIZE=$1
 
+BASE_PATH=$(cd "`dirname $0`" || exit; pwd)
+cd $BASE_PATH/../ || exit
+
 for((i=0;i<RANK_SIZE;i++))
 do
     export DEVICE_ID=$i
@@ -56,6 +59,7 @@ do
     rm -rf LOG$i
     mkdir ./LOG$i
     cp  *.py ./LOG$i
+    cp -r ./src ./LOG$i
     cd ./LOG$i || exit
     export RANK_ID=$i
     echo "start training for rank $i, device $DEVICE_ID"
@@ -63,7 +67,7 @@ do
 
     if [ $# == 6 ]
     then
-        taskset -c $cmdopt python ../train.py  \
+        taskset -c $cmdopt python train.py  \
         --distribute=1  \
         --lr=0.005 \
         --device_num=$RANK_SIZE  \
@@ -76,7 +80,7 @@ do
 
     if [ $# == 8 ]
     then
-        taskset -c $cmdopt python ../train.py  \
+        taskset -c $cmdopt python train.py  \
         --distribute=1  \
         --lr=0.005 \
         --device_num=$RANK_SIZE  \
diff --git a/example/yolov3_coco2017/run_eval.sh b/model_zoo/yolov3/scripts/run_eval.sh
similarity index 94%
rename from example/yolov3_coco2017/run_eval.sh
rename to model_zoo/yolov3/scripts/run_eval.sh
index 4608e925894..ccdb6198542 100644
--- a/example/yolov3_coco2017/run_eval.sh
+++ b/model_zoo/yolov3/scripts/run_eval.sh
@@ -20,4 +20,7 @@ echo "sh run_eval.sh DEVICE_ID CKPT_PATH MINDRECORD_DIR IMAGE_DIR ANNO_PATH"
 echo "for example: sh run_eval.sh 0 yolo.ckpt ./Mindrecord_eval ./dataset ./dataset/eval.txt"
 echo "=============================================================================================================="
 
+BASE_PATH=$(cd "`dirname $0`" || exit; pwd)
+cd $BASE_PATH/../ || exit
+
 python eval.py --device_id=$1 --ckpt_path=$2 --mindrecord_dir=$3 --image_dir=$4 --anno_path=$5
diff --git a/example/yolov3_coco2017/run_standalone_train.sh b/model_zoo/yolov3/scripts/run_standalone_train.sh
similarity index 96%
rename from example/yolov3_coco2017/run_standalone_train.sh
rename to model_zoo/yolov3/scripts/run_standalone_train.sh
index 8bce45d89c4..71634a89cbf 100644
--- a/example/yolov3_coco2017/run_standalone_train.sh
+++ b/model_zoo/yolov3/scripts/run_standalone_train.sh
@@ -27,6 +27,9 @@ then
     exit 1
 fi
 
+BASE_PATH=$(cd "`dirname $0`" || exit; pwd)
+cd $BASE_PATH/../ || exit
+
 if [ $# == 5 ]
 then
     python train.py --device_id=$1 --epoch_size=$2 --mindrecord_dir=$3 --image_dir=$4 --anno_path=$5
diff --git a/example/yolov3_coco2017/config.py b/model_zoo/yolov3/src/config.py
similarity index 98%
rename from example/yolov3_coco2017/config.py
rename to model_zoo/yolov3/src/config.py
index 6d858bcbcbf..37bdcb944b3 100644
--- a/example/yolov3_coco2017/config.py
+++ b/model_zoo/yolov3/src/config.py
@@ -25,7 +25,7 @@ class ConfigYOLOV3ResNet18:
     """
     img_shape = [352, 640]
     feature_shape = [32, 3, 352, 640]
-    num_classes = 80
+    num_classes = 2
     nms_max_num = 50
 
     backbone_input_shape = [64, 64, 128, 256]
diff --git a/example/yolov3_coco2017/dataset.py b/model_zoo/yolov3/src/dataset.py
similarity index 99%
rename from example/yolov3_coco2017/dataset.py
rename to model_zoo/yolov3/src/dataset.py
index 23d34e0f4fa..22e3a1dad24 100644
--- a/example/yolov3_coco2017/dataset.py
+++ b/model_zoo/yolov3/src/dataset.py
@@ -23,7 +23,7 @@ from PIL import Image
 import mindspore.dataset as de
 from mindspore.mindrecord import FileWriter
 import mindspore.dataset.transforms.vision.c_transforms as C
-from config import ConfigYOLOV3ResNet18
+from src.config import ConfigYOLOV3ResNet18
 
 iter_cnt = 0
 _NUM_BOXES = 50
diff --git a/example/yolov3_coco2017/util.py b/model_zoo/yolov3/src/utils.py
similarity index 99%
rename from example/yolov3_coco2017/util.py
rename to model_zoo/yolov3/src/utils.py
index 62e15afe388..b0462db65e8 100644
--- a/example/yolov3_coco2017/util.py
+++ b/model_zoo/yolov3/src/utils.py
@@ -15,7 +15,7 @@
 """metrics utils"""
 
 import numpy as np
-from config import ConfigYOLOV3ResNet18
+from src.config import ConfigYOLOV3ResNet18
 
 
 def calc_iou(bbox_pred, bbox_ground):
diff --git a/mindspore/model_zoo/yolov3.py b/model_zoo/yolov3/src/yolov3.py
similarity index 100%
rename from mindspore/model_zoo/yolov3.py
rename to model_zoo/yolov3/src/yolov3.py
diff --git a/example/yolov3_coco2017/train.py b/model_zoo/yolov3/train.py
similarity index 97%
rename from example/yolov3_coco2017/train.py
rename to model_zoo/yolov3/train.py
index 43039b7bbc2..0a15066ed3b 100644
--- a/example/yolov3_coco2017/train.py
+++ b/model_zoo/yolov3/train.py
@@ -33,9 +33,9 @@ from mindspore.train import Model, ParallelMode
 from mindspore.train.serialization import load_checkpoint, load_param_into_net
 from mindspore.common.initializer import initializer
 
-from mindspore.model_zoo.yolov3 import yolov3_resnet18, YoloWithLossCell, TrainingWrapper
-from dataset import create_yolo_dataset, data_to_mindrecord_byte_image
-from config import ConfigYOLOV3ResNet18
+from src.yolov3 import yolov3_resnet18, YoloWithLossCell, TrainingWrapper
+from src.dataset import create_yolo_dataset, data_to_mindrecord_byte_image
+from src.config import ConfigYOLOV3ResNet18
 
 
 def get_lr(learning_rate, start_step, global_step, decay_step, decay_rate, steps=False):