From 8992a4dcaee8a903c6e771f0381c042ce1c1bfe8 Mon Sep 17 00:00:00 2001
From: xumemg <xumengmeng16@huawei-partners.com>
Date: Tue, 6 Dec 2022 17:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ID4032=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeepCTR_Series_for_TensorFlow/examples/run_dcnmix.py   | 4 ++--
 .../test/train_ID4032_DCNMix_full_1p.sh                    | 7 ++++---
 .../test/train_ID4032_DCNMix_full_8p.sh                    | 2 +-
 .../test/train_ID4032_DCNMix_performance_1p.sh             | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/examples/run_dcnmix.py b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/examples/run_dcnmix.py
index 8ff0a1ec1..4f5831e4a 100644
--- a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/examples/run_dcnmix.py
+++ b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/examples/run_dcnmix.py
@@ -177,8 +177,8 @@ def main():
 
     tf.compat.v1.logging.set_verbosity(tf.compat.v1.logging.INFO)
     model.train(train_model_input, max_steps=args.max_steps)
-    # if rank_id == 0:
-    #     model.evaluate(test_model_input)
+    if rank_id == 0:
+        model.evaluate(test_model_input)
 
 if __name__ == "__main__":
     main()
diff --git a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_1p.sh b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_1p.sh
index 76697629f..1aa57c53a 100644
--- a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_1p.sh
+++ b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_1p.sh
@@ -16,7 +16,7 @@ train_epochs=4
 #训练batch_size
 batch_size=10240
 #训练step
-train_steps=
+train_steps=16115
 #学习率
 learning_rate=
 
@@ -101,6 +101,7 @@ do
         --train_batch_size=${batch_size} \
         --eval_batch_size=${batch_size} \
         --num_epochs=${train_epochs} \
+        --max_steps=${train_steps} \
         --output_dir=${cur_path}/output/$ASCEND_DEVICE_ID/ckpt > ${cur_path}/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 &
 done 
 wait
@@ -113,7 +114,7 @@ e2e_time=$(( $end_time - $start_time ))
 #结果打印，不需要修改
 echo "------------------ Final result ------------------"
 # #输出性能FPS，需要模型审视修改
-fps=`grep "examples\/sec" $cur_path/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log | awk '{print $2}'|tail -n +5 |awk '{sum+=$1} END {print sum/NR}'`
+fps=`grep "examples\/sec" $cur_path/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log | awk '{print $2}'|tail -n +5 | awk 'NR>1{print p}{p=$0}'|awk '{sum+=$1} END {print sum/NR}'`
 FPS=`awk 'BEGIN{printf "%.2f\n", '${fps}'}'`
 # #打印，不需要修改
 echo "Final Performance item/sec : $FPS"
@@ -134,7 +135,7 @@ CaseName=${Network}_bs${BatchSize}_${RANK_SIZE}'p'_'accu'
 TrainingTime=`awk 'BEGIN{printf "%.6f\n",'${BatchSize}'/'${FPS}'}'`
 
 ActualFPS=${FPS}
-grep ":loss =" $cur_path/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log| awk '{print $3}' | sed 's/,//g' > $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt
+grep ":loss =" $cur_path/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log| awk '{print $3}' | sed 's/,//g'| sed -n '1~2p' > $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt
 #最后一个迭代loss值，不需要修改
 ActualLoss=`awk 'END {print}' $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt`
 
diff --git a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_8p.sh b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_8p.sh
index 9cef9288e..60f518698 100644
--- a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_8p.sh
+++ b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_full_8p.sh
@@ -13,7 +13,7 @@ data_path=""
 #网络名称，同目录名称
 Network="DCNMix_ID4032_for_TensorFlow"
 #训练epoch
-train_epochs=5
+train_epochs=4
 #训练batch_size
 batch_size=10240
 #训练step
diff --git a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_performance_1p.sh b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_performance_1p.sh
index 199f2d05d..667aefaa6 100644
--- a/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_performance_1p.sh
+++ b/TensorFlow/built-in/recommendation/DeepCTR_Series_for_TensorFlow/test/train_ID4032_DCNMix_performance_1p.sh
@@ -114,7 +114,7 @@ e2e_time=$(( $end_time - $start_time ))
 #结果打印，不需要修改
 echo "------------------ Final result ------------------"
 # #输出性能FPS，需要模型审视修改
-fps=`grep "examples\/sec" $cur_path/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log | awk '{print $2}'|tail -n +5 |awk '{sum+=$1} END {print sum/NR}'`
+fps=`grep "examples\/sec" $cur_path/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log | awk '{print $2}'|tail -n +5 | awk 'NR>1{print p}{p=$0}'|awk '{sum+=$1} END {print sum/NR}'`
 FPS=`awk 'BEGIN{printf "%.2f\n", '${fps}'}'`
 # #打印，不需要修改
 echo "Final Performance item/sec : $FPS"
@@ -132,7 +132,7 @@ CaseName=${Network}_bs${BatchSize}_${RANK_SIZE}'p'_'perf'
 TrainingTime=`awk 'BEGIN{printf "%.6f\n",'${BatchSize}'/'${FPS}'}'`
 
 ActualFPS=${FPS}
-grep ":loss =" $cur_path/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log| awk '{print $3}' | sed 's/,//g' > $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt
+grep ":loss =" $cur_path/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log| awk '{print $3}' | sed 's/,//g' | sed -n '1~2p' > $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt
 #最后一个迭代loss值，不需要修改
 ActualLoss=`awk 'END {print}' $cur_path/output/$ASCEND_DEVICE_ID/train_${CaseName}_loss.txt`
 
-- 
Gitee