From 5f907705acc27be0a96b384075f6a7bd08c94603 Mon Sep 17 00:00:00 2001
From: hwjiaorui <jiaorui3@huawei.com>
Date: Fri, 11 Sep 2020 15:42:53 +0800
Subject: [PATCH] read json file

modify step output

modify split

read json split

fix bug of args

set dataset sink mode

modify dataset sink mode
---
 .../cv/mobilenetv2_quant/scripts/run_train.sh | 20 +++++++++++++------
 .../cv/mobilenetv2_quant/src/utils.py         |  3 +--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/model_zoo/official/cv/mobilenetv2_quant/scripts/run_train.sh b/model_zoo/official/cv/mobilenetv2_quant/scripts/run_train.sh
index 70e1f6d37d..ff0c159807 100644
--- a/model_zoo/official/cv/mobilenetv2_quant/scripts/run_train.sh
+++ b/model_zoo/official/cv/mobilenetv2_quant/scripts/run_train.sh
@@ -82,13 +82,20 @@ run_ascend(){
     fi
 
 
-    rank_file_name=${2##*/}
-    IFS='_' read -ra array <<<"${rank_file_name}"
-    device_id_list=${array[2]}
-    first_device=${device_id_list:0:1}
+
+    #rank_file_name=${2##*/}
+    #IFS='_' read -ra array <<<"${rank_file_name}"
+    #device_id_list=${array[2]}
+    #first_device=${device_id_list:0:1}
     #last_device=${device_list:${#device_list}-1:1}
-    device_num=${#device_id_list}
-    
+    #device_num=${#device_id_list}
+    cat $2 | awk -F "[device_id]" '/device_id/{print$0}' >temp.log
+    array=$(cat temp.log | awk -F "[:]" '/device_id/{print$2}')
+    rm temp.log
+    IFS=" " read -ra device_list <<<$array
+    first_device=${device_list[0]:1:1}
+    device_num=${#device_list[*]}
+
     ulimit -u unlimited
     export DEVICE_NUM=${device_num}
     export RANK_SIZE=${device_num}
@@ -188,3 +195,4 @@ elif [ $1 = "GPU" ] ; then
 else
     echo "Unsupported device target: $1"
 fi;
+
diff --git a/model_zoo/official/cv/mobilenetv2_quant/src/utils.py b/model_zoo/official/cv/mobilenetv2_quant/src/utils.py
index a00ac53349..9a6cb7d031 100644
--- a/model_zoo/official/cv/mobilenetv2_quant/src/utils.py
+++ b/model_zoo/official/cv/mobilenetv2_quant/src/utils.py
@@ -74,8 +74,7 @@ class Monitor(Callback):
         cur_step_in_epoch = (cb_params.cur_step_num - 1) % cb_params.batch_num
 
         print("epoch: [{:3d}/{:3d}], step:[{:5d}/{:5d}], loss:[{:5.3f}/{:5.3f}], time:[{:5.3f}], lr:[{:5.5f}]".format(
-            cb_params.cur_epoch_num -
-            1, cb_params.epoch_num, cur_step_in_epoch, cb_params.batch_num, step_loss,
+            cb_params.cur_epoch_num, cb_params.epoch_num, cur_step_in_epoch+1, cb_params.batch_num, step_loss,
             np.mean(self.losses), step_mseconds, self.lr_init[cb_params.cur_step_num - 1]))