From b920f92d39b36ac2a9ecd89a14f0950c5640d5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 01:42:47 +0000 Subject: [PATCH 01/33] dynamic_input --- .../test/train_full_1p.sh | 5 +++++ .../test/train_performance_1p.sh | 5 +++++ .../detection/SSD-VGG_ID1619_for_TensorFlow/train.py | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh index fe078086b..b36cd32d1 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh @@ -17,6 +17,7 @@ learning_rate= #参数配置 data_path=$cur_path +dynamic_input="" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_full_1p.sh --data_path=../" @@ -27,6 +28,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -62,6 +65,7 @@ nohup python3 train.py \ --epochs ${train_epochs} \ --data-dir $data_path/pascal-voc \ --vgg-dir $data_path/vgg_graph \ + --dynamic_input=${dynamic_input} \ "${@:1}" > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait @@ -117,3 +121,4 @@ echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh index 0004076aa..802d8e82f 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh @@ -19,6 +19,7 @@ learning_rate= #参数配置 data_path=$cur_path +dynamic_input="" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_performance_1p.sh --data_path=../" @@ -29,6 +30,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -64,6 +67,7 @@ nohup python3 train.py \ --epochs ${train_epochs} \ --data-dir $data_path/pascal-voc \ --vgg-dir $data_path/vgg_graph \ + --dynamic_input=${dynamic_input} \ "${@:1}" > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait @@ -118,3 +122,4 @@ echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/train.py b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/train.py index 10fd58af0..822a1beaf 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/train.py +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/train.py @@ -107,7 +107,9 @@ def main(): parser.add_argument('--dump_path', type=str, default='/home/HwHiAiUser/', help='dump path') parser.add_argument('--data_path', type=str, default='./', - help='data path') + help='data path') + parser.add_argument("--dynamic_input", type=str, default='1', + help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") #****** npu modify end ****** args = parser.parse_args() @@ -130,6 +132,7 @@ def main(): print('[i] Overflow dump flag: ', args.over_dump) print('[i] data dump flag: ', args.data_dump) print('[i] Dump path: ', args.dump_path) + print('[i] dynamic_input: ', args.dynamic_input) #****** npu modify end ****** #--------------------------------------------------------------------------- # Find an existing checkpoint @@ -205,7 +208,12 @@ def main(): custom_op.name = "NpuOptimizer" custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["dynamic_input"].b = 1 - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") custom_op.parameter_map["use_off_line"].b = True custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes(args.precision_mode) if args.over_dump: -- Gitee From 94c32275e574bc3484bf7204459b8fc9d9108696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 02:12:57 +0000 Subject: [PATCH 02/33] dynamic_input --- .../SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh | 2 +- .../SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh index b36cd32d1..64c3a01c3 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh @@ -65,7 +65,7 @@ nohup python3 train.py \ --epochs ${train_epochs} \ --data-dir $data_path/pascal-voc \ --vgg-dir $data_path/vgg_graph \ - --dynamic_input=${dynamic_input} \ + --dynamic_input ${dynamic_input} \ "${@:1}" > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh index 802d8e82f..d4f9f7bdf 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh @@ -67,7 +67,7 @@ nohup python3 train.py \ --epochs ${train_epochs} \ --data-dir $data_path/pascal-voc \ --vgg-dir $data_path/vgg_graph \ - --dynamic_input=${dynamic_input} \ + --dynamic_input ${dynamic_input} \ "${@:1}" > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait -- Gitee From 2228dfd07f769a773ad4b0bb6408a9290926ad8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 02:41:06 +0000 Subject: [PATCH 03/33] dynamic_input --- .../SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh | 2 +- .../SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh index 64c3a01c3..105c5916b 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_full_1p.sh @@ -17,7 +17,7 @@ learning_rate= #参数配置 data_path=$cur_path -dynamic_input="" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_full_1p.sh --data_path=../" diff --git a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh index d4f9f7bdf..2c004af3b 100644 --- a/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/detection/SSD-VGG_ID1619_for_TensorFlow/test/train_performance_1p.sh @@ -19,7 +19,7 @@ learning_rate= #参数配置 data_path=$cur_path -dynamic_input="" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_performance_1p.sh --data_path=../" -- Gitee From a79821cdedba7f0993ea24fa7214e7e061c7990b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 03:12:48 +0000 Subject: [PATCH 04/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/main.py | 8 +++++++- .../2D_Unet_ID2337_for_TensorFlow/test/train_full_1p.sh | 9 +++++++-- .../test/train_performance_1p.sh | 9 +++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/main.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/main.py index f52a29fe1..659c8a97d 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/main.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/main.py @@ -39,6 +39,7 @@ parser.add_argument('--epochs', default=5, type=int) parser.add_argument('--train_data_path', default='./data/membrane/train') parser.add_argument('--test_data_path', default='./data/membrane/test') parser.add_argument('--predict_data_path', default='./data/membrane/predict') +parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") args = parser.parse_args() def main(): @@ -66,7 +67,12 @@ if __name__ == '__main__': custom_op.name = "NpuOptimizer" custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["dynamic_input"].b = 1 - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") npu_keras_sess = set_keras_session_npu_config(config=global_config) # ***** npu modify end ***** main() diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_full_1p.sh index 315bbaa30..1b4179dae 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_full_1p.sh @@ -18,6 +18,7 @@ learning_rate= #参数配置 data_path="" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_full_1p.sh --data_path=./datasets" @@ -28,6 +29,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -51,7 +54,8 @@ start=$(date +%s) python3 main.py --epochs=${train_epochs} \ --train_data_path=${data_path}/data/membrane/train \ --test_data_path=${data_path}/data/membrane/test \ - --predict_data_path=${cur_path}/test/predict > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --predict_data_path=${cur_path}/test/predict \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) @@ -109,4 +113,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh index fef0301de..88b902cb7 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh @@ -18,6 +18,7 @@ learning_rate= #参数配置 data_path="" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_performance_1p.sh --data_path=./datasets" @@ -28,6 +29,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -51,7 +54,8 @@ start=$(date +%s) python3 main.py --epochs=${train_epochs} \ --train_data_path=${data_path}/data/membrane/train \ --test_data_path=${data_path}/data/membrane/test \ - --predict_data_path=${cur_path}/test/predict > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --predict_data_path=${cur_path}/test/predict \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) @@ -109,4 +113,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From b5f1027c933efd1e3390bb2a2f8f2d7612233c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 07:21:51 +0000 Subject: [PATCH 05/33] dynamic_input --- .../cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py | 1 + .../contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py | 7 ++++++- .../ADAGAN_ID2115_for_TensorFlow/test/train_full_1p.sh | 8 ++++++-- .../test/train_performance_1p.sh | 9 +++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py index bd236179e..378f62dd0 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py @@ -66,6 +66,7 @@ flags.DEFINE_bool("unrolled", True, "Use unrolled GAN training [True]") flags.DEFINE_bool("is_bagging", False, "Do we want to use bagging instead of adagan? [False]") flags.DEFINE_string("obs_dir", "obs://test-modelartsxc/LOG", "obs result path, not need on gpu and apulis platform") flags.DEFINE_string("result", "/home/ma-user/modelarts/user-job-dir", "The result directory where the model checkpoints will be written.") +flags.DEFINE_integer("--dynamic_input", '1', "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") FLAGS = flags.FLAGS #勿注释也勿删 print('epochs',FLAGS.epochs) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py index 7c302bfcc..8ea87113b 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py @@ -58,7 +58,12 @@ class Gan(object): custom_op = config.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = "NpuOptimizer" custom_op.parameter_map["dynamic_input"].b = True - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") config.graph_options.rewrite_options.remapping = RewriterConfig.OFF # 必须显式关闭remap run_config = NPURunConfig(enable_data_pre_proc=False) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_full_1p.sh index c120d0eeb..54281fe46 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_full_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -111,7 +114,7 @@ do #执行训练脚本,以下传参不需要修改,其他需要模型审视修改 - python3 adagan_gmm.py > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 + python3 adagan_gmm.py --dynamic_input ${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 done @@ -156,4 +159,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_performance_1p.sh index 1bbb9a1da..a96512fac 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/test/train_performance_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -113,7 +116,8 @@ do python3 adagan_gmm.py \ --epochs=${train_epochs} \ - --steps=${train_steps} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 + --steps=${train_steps} \ + --dynamic_input ${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 done @@ -158,4 +162,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From 9bc7931c2ad4dd230e45d3bfc96c973ac04e743c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 07:57:10 +0000 Subject: [PATCH 06/33] dynamic_input --- .../contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py index 378f62dd0..285ac3e7c 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py @@ -66,7 +66,7 @@ flags.DEFINE_bool("unrolled", True, "Use unrolled GAN training [True]") flags.DEFINE_bool("is_bagging", False, "Do we want to use bagging instead of adagan? [False]") flags.DEFINE_string("obs_dir", "obs://test-modelartsxc/LOG", "obs result path, not need on gpu and apulis platform") flags.DEFINE_string("result", "/home/ma-user/modelarts/user-job-dir", "The result directory where the model checkpoints will be written.") -flags.DEFINE_integer("--dynamic_input", '1', "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") +flags.DEFINE_integer("dynamic_input", '1', "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") FLAGS = flags.FLAGS #勿注释也勿删 print('epochs',FLAGS.epochs) -- Gitee From c5351861f0071bf71497505cd8388f67d4bcaa09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Fri, 25 Mar 2022 08:09:34 +0000 Subject: [PATCH 07/33] dynamic_input --- .../contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py index 285ac3e7c..627bed38a 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/adagan_gmm.py @@ -66,7 +66,6 @@ flags.DEFINE_bool("unrolled", True, "Use unrolled GAN training [True]") flags.DEFINE_bool("is_bagging", False, "Do we want to use bagging instead of adagan? [False]") flags.DEFINE_string("obs_dir", "obs://test-modelartsxc/LOG", "obs result path, not need on gpu and apulis platform") flags.DEFINE_string("result", "/home/ma-user/modelarts/user-job-dir", "The result directory where the model checkpoints will be written.") -flags.DEFINE_integer("dynamic_input", '1', "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") FLAGS = flags.FLAGS #勿注释也勿删 print('epochs',FLAGS.epochs) @@ -176,6 +175,7 @@ if __name__ == '__main__': parser.add_argument("--data_url", type=str, default="/test-modelartsxc/dataset/train") parser.add_argument("--modelarts_data_dir", type=str, default="/cache/dataset/train") parser.add_argument("--modelarts_result_dir", type=str, default="/cache/result") + parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") config, unparsed = parser.parse_known_args() while len(sys.argv) > 1: sys.argv.pop() -- Gitee From 83e9a98b9556b9e3319b2d64608f1310666aca5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 01:53:44 +0000 Subject: [PATCH 08/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 8 +++++++- .../test/train_full_1p.sh | 8 ++++++-- .../test/train_performance_1p.sh | 8 ++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index 46f51c5a8..f7163bb01 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -65,6 +65,7 @@ def parse_args(): ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') + parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") return parser.parse_args() args = parse_args() @@ -145,7 +146,12 @@ def Train(epochs=100): custom_op = global_config.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = "NpuOptimizer" custom_op.parameter_map["dynamic_input"].b = 1 - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") global_config.graph_options.rewrite_options.remapping = RewriterConfig.OFF global_config.graph_options.rewrite_options.memory_optimization = RewriterConfig.OFF #with tf.Session() as sess: diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_full_1p.sh index 33673edf9..2c86cd50a 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_full_1p.sh @@ -20,6 +20,7 @@ learning_rate= #参数配置 data_path="" +dynamic_input="1" #work_dir="$cur_path/estimator_working_dir" #export_path="$cur_path/outputs/models/000001-first_generation" @@ -32,6 +33,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -58,7 +61,8 @@ nohup python3 TrainResNet.py \ --image_name_path ${data_path}/label/name_1200.npy \ --train_data_path ${data_path}/train_data/1200_data.npy \ --parentPath ${data_path}/CACD2000_Crop/ \ - --epochs 100 > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --epochs 100 \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) e2e_time=$(( $end - $start )) @@ -114,4 +118,4 @@ echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEV echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log - +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_performance_1p.sh index 3e3574299..41420ab08 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/test/train_performance_1p.sh @@ -20,6 +20,7 @@ learning_rate= #参数配置 data_path="" +dynamic_input="1" #work_dir="$cur_path/estimator_working_dir" #export_path="$cur_path/outputs/models/000001-first_generation" @@ -32,6 +33,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -58,7 +61,8 @@ nohup python3 TrainResNet.py \ --image_name_path ${data_path}/label/name_1200.npy \ --train_data_path ${data_path}/train_data/1200_data.npy \ --parentPath ${data_path}/CACD2000_Crop/ \ - --epochs 2 > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --epochs 2 \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) e2e_time=$(( $end - $start )) @@ -114,4 +118,4 @@ echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEV echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log - +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -- Gitee From 3306e5f5974ec21c3f57e3a2658d458c00950ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:08:01 +0000 Subject: [PATCH 09/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index f7163bb01..10c96db9b 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -65,7 +65,8 @@ def parse_args(): ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") + parser.add_argument("--dynamic_input", type=str, default='1', + help="--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph") return parser.parse_args() args = parse_args() -- Gitee From 66f8757baa306219735602130081ac1ec05b2e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:13:37 +0000 Subject: [PATCH 10/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index 10c96db9b..213f8a29f 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -65,8 +65,7 @@ def parse_args(): ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - parser.add_argument("--dynamic_input", type=str, default='1', - help="--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph") + parser.add_argument('--dynamic_input', type=str, default='1', help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') return parser.parse_args() args = parse_args() -- Gitee From 4c9c7a3fecfebe72a3aece0ac888552e9e87580f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:18:05 +0000 Subject: [PATCH 11/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index 213f8a29f..165b72931 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -65,7 +65,10 @@ def parse_args(): ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - parser.add_argument('--dynamic_input', type=str, default='1', help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') + parser.add_argument('--dynamic_input', + type=str, + default='1', + help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') return parser.parse_args() args = parse_args() -- Gitee From d8d9ab3d91a0973a26749ed61b5859134bbc6642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:31:43 +0000 Subject: [PATCH 12/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index 165b72931..b11206223 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -58,6 +58,7 @@ from utils import * def parse_args(): desc = "MAIN" parser = argparse.ArgumentParser(description=desc) + parser.add_argument('--dynamic_input', type=str, default='1', help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') parser.add_argument('--label_path', type=str, default='./label/label_1200.npy', help='Path of Label.npy') parser.add_argument('--image_name_path', type=str, default='./label/name_1200.npy', help='Path of image file names') ############################add train_data_path################################## @@ -65,10 +66,6 @@ def parse_args(): ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - parser.add_argument('--dynamic_input', - type=str, - default='1', - help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') return parser.parse_args() args = parse_args() -- Gitee From eee19ec640c2f9431a64cf01f1cc46dd565e6563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:40:59 +0000 Subject: [PATCH 13/33] dynamic_input --- .../TrainResNet.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index b11206223..cb7611588 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -56,17 +56,16 @@ from scipy import misc from utils import * def parse_args(): - desc = "MAIN" - parser = argparse.ArgumentParser(description=desc) + desc = "MAIN"parser = argparse.ArgumentParser(description=desc) parser.add_argument('--dynamic_input', type=str, default='1', help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') - parser.add_argument('--label_path', type=str, default='./label/label_1200.npy', help='Path of Label.npy') - parser.add_argument('--image_name_path', type=str, default='./label/name_1200.npy', help='Path of image file names') - ############################add train_data_path################################## - parser.add_argument('--train_data_path', type=str, default='./train_data/1200_data.npy', help='Path of train data') - ############################add train_data_path################################## - parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') - parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - return parser.parse_args() + parser.add_argument('--label_path', type=str, default='./label/label_1200.npy', help='Path of Label.npy') + parser.add_argument('--image_name_path', type=str, default='./label/name_1200.npy', help='Path of image file names') + ############################add train_data_path################################## + parser.add_argument('--train_data_path', type=str, default='./train_data/1200_data.npy', help='Path of train data') + ############################add train_data_path################################## + parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') + parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') + return parser.parse_args() args = parse_args() # image size -- Gitee From 955971da117a40e7760d41412c48bf504298061a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:47:51 +0000 Subject: [PATCH 14/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index cb7611588..c7ba09972 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -64,8 +64,7 @@ def parse_args(): parser.add_argument('--train_data_path', type=str, default='./train_data/1200_data.npy', help='Path of train data') ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') - parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') - return parser.parse_args() + parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS')return parser.parse_args() args = parse_args() # image size -- Gitee From d9d8dccdf51a3166b9baec3103f54f5149496074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:51:30 +0000 Subject: [PATCH 15/33] dynnamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index c7ba09972..1149306f3 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -56,7 +56,8 @@ from scipy import misc from utils import * def parse_args(): - desc = "MAIN"parser = argparse.ArgumentParser(description=desc) + desc = "MAIN" + parser = argparse.ArgumentParser(description=desc) parser.add_argument('--dynamic_input', type=str, default='1', help='--dynamic_input=1 Use fuzzy compilation --dynamic_input=lazy_recompile Compile using lazy static graph') parser.add_argument('--label_path', type=str, default='./label/label_1200.npy', help='Path of Label.npy') parser.add_argument('--image_name_path', type=str, default='./label/name_1200.npy', help='Path of image file names') -- Gitee From dc5d6e7a694cbb83ac71dcb4fca534bc6839c0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 02:59:41 +0000 Subject: [PATCH 16/33] dynamic_input --- .../Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py index 1149306f3..b184e85ea 100644 --- a/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py +++ b/TensorFlow/built-in/cv/image_classification/Face-ResNet50_ID1372_for_TensorFlow/TrainResNet.py @@ -65,7 +65,8 @@ def parse_args(): parser.add_argument('--train_data_path', type=str, default='./train_data/1200_data.npy', help='Path of train data') ############################add train_data_path################################## parser.add_argument('--parentPath', type=str, default='./CACD2000_Crop/', help='image path') - parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS')return parser.parse_args() + parser.add_argument('--epochs', type=int, default=100, help='NUM_EPOCHS') + return parser.parse_args() args = parse_args() # image size -- Gitee From 9719b4d3ef38b571c464534afe35984226c9c3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 06:14:26 +0000 Subject: [PATCH 17/33] dynamic_input --- .../post_tprnn_npu_code_chun/tprnn_train_human.py | 11 ++++++++++- .../test/train_performance_1p.sh | 11 ++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py index 9d0f92adf..842a064c2 100644 --- a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py +++ b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py @@ -145,6 +145,10 @@ parser.add_argument( parser.add_argument( "--data_url", type=str, default="./dataset" ) # PyCharm插件传入的 Data Path in OBS路径 +parser.add_argument( + "--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph" + ) + #add parser.add_argument("--locals_dir", default="/data2/NRE_Check/wx1056345/ID1297_tprnn/data/h3.6m/dataset") @@ -318,7 +322,12 @@ def train(): custom_op.name = "NpuOptimizer" #add custom_op.parameter_map['dynamic_input'].b = True - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") ##混合精度 custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("force_fp16") diff --git a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/test/train_performance_1p.sh index af988dc74..6480b9505 100644 --- a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/test/train_performance_1p.sh @@ -14,6 +14,7 @@ RANK_ID_START=0 data_path='' #预训练模型地址 ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要改 #export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -77,7 +78,9 @@ do data_path=`echo ${para#*=}` elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` - fi + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` + fi done # #校验是否传入data_path,不需要修改 # if [[$data_path == ""]];then @@ -105,7 +108,8 @@ python3 tprnn_train_human.py \ --locals_dir=${data_path} \ --model_dir=$cur_path/result \ --iterations=1000 \ - --test_every=2000 > ${cur_path}/test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 + --test_every=2000 \ + --dynamic_input ${dynamic_input} > ${cur_path}/test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 wait #训练结束时间,不需要修改 @@ -155,4 +159,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -#echo "Accuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +#echo "Accuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From 637d9761811d68a4e0e6272a12f3a56b9012d380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 06:32:55 +0000 Subject: [PATCH 18/33] dynamic_input --- .../post_tprnn_npu_code_chun/tprnn_train_human.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py index 842a064c2..7b5a086ec 100644 --- a/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py +++ b/TensorFlow/contrib/cv/tprnn_ID1297_for_TensorFlow/post_tprnn_npu_code_chun/tprnn_train_human.py @@ -322,9 +322,9 @@ def train(): custom_op.name = "NpuOptimizer" #add custom_op.parameter_map['dynamic_input'].b = True - if args.dynamic_input == "lazy_recompile": + if FLAGS.dynamic_input == "lazy_recompile": custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") - elif args.dynamic_input == "1": + elif FLAGS.dynamic_input == "1": custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") else: print("Enter correct compilation parameters.") -- Gitee From ae87377f53c98d8009b00e47c0f173bd7f3060f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 08:13:39 +0000 Subject: [PATCH 19/33] dynamic_input --- .../MGCNN_ID1039_for_TensorFlow/mgcnn_npu.py | 29 ++++++++++++------- .../test/train_full_1p.sh | 9 ++++-- .../test/train_performance_1p.sh | 9 ++++-- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/mgcnn_npu.py b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/mgcnn_npu.py index 908b68995..cba822189 100644 --- a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/mgcnn_npu.py +++ b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/mgcnn_npu.py @@ -187,17 +187,6 @@ class mgcnn(object): if __name__ == '__main__': - # npu_keras_sess = set_keras_session_npu_config() - # ***** npu modify begin ***** - os.system(" export ENABLE_FORCE_V2_CONTROL = 1") - # export ENABLE_FORCE_V2_CONTROL = 1 - global_config = tf.ConfigProto(log_device_placement=False) - custom_op = global_config.graph_options.rewrite_options.custom_optimizers.add() - custom_op.name = "NpuOptimizer" - custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") - custom_op.parameter_map["dynamic_input"].b = 1 - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") - npu_keras_sess = set_keras_session_npu_config(config=global_config) # ***** npu modify end ***** description = ("Train a CNN to classify four cosmological models\n" + @@ -223,8 +212,26 @@ if __name__ == '__main__': help="specific gpu id to use") parser.add_argument("-datapath", "--datapath", type=str, default="/cache/dataset/data", help="specific gpu id to use") + parser.add_argument("--dynamic_input", type=str, default='1', + help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") args = parser.parse_args() + # npu_keras_sess = set_keras_session_npu_config() + # ***** npu modify begin ***** + os.system(" export ENABLE_FORCE_V2_CONTROL = 1") + # export ENABLE_FORCE_V2_CONTROL = 1 + global_config = tf.ConfigProto(log_device_placement=False) + custom_op = global_config.graph_options.rewrite_options.custom_optimizers.add() + custom_op.name = "NpuOptimizer" + custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") + custom_op.parameter_map["dynamic_input"].b = 1 + if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") + elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") + else: + print("Enter correct compilation parameters.") + npu_keras_sess = set_keras_session_npu_config(config=global_config) noise_opts = {0: "clean", 1: "sigma035", 2: "sigma070"} noise_name = noise_opts[args.noise] diff --git a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_full_1p.sh index 274129ace..97be2b7ed 100644 --- a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_full_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -123,7 +126,8 @@ do python3 mgcnn_npu.py \ --datapath=${data_path}/data/ \ --iterations=${train_steps} \ - --epochs=${train_epochs} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 & + --epochs=${train_epochs} \ + --dynamic_input ${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 & done @@ -171,4 +175,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_performance_1p.sh index 657a4a243..3d0535194 100644 --- a/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/MGCNN_ID1039_for_TensorFlow/test/train_performance_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -123,7 +126,8 @@ do python3 mgcnn_npu.py \ --datapath=${data_path}/data/ \ --iterations=${train_steps} \ - --epochs=${train_epochs} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 & + --epochs=${train_epochs} \ + --dynamic_input ${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 & done @@ -171,4 +175,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From 84e5b73892e585eb3195629e9922b1d8cefb0459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Mon, 28 Mar 2022 08:53:23 +0000 Subject: [PATCH 20/33] dynamic_input --- .../Hybrid-Spectral-Net.py | 17 ++++++++++++++++- .../test/train_full_1p.sh | 8 ++++++-- .../test/train_performance_1p.sh | 8 ++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py index 55a6cce34..61e9c76d0 100644 --- a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py +++ b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py @@ -61,6 +61,16 @@ import scipy.io as sio # init_notebook_mode(connected=True) # %matplotlib inline from tensorflow.core.protobuf.rewriter_config_pb2 import RewriterConfig +import argparse + + +def init_arg(): + parser = argparse.ArgumentParser() + parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") + return parser.parse_args() + + +args = init_arg() config = tf.compat.v1.ConfigProto() custom_op = config.graph_options.rewrite_options.custom_optimizers.add() @@ -68,7 +78,12 @@ custom_op.name = "NpuOptimizer" custom_op.parameter_map["use_off_line"].b = True config.graph_options.rewrite_options.remapping = RewriterConfig.OFF custom_op.parameter_map["dynamic_input"].b = True -custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") +if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") +elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") +else: + print("Enter correct compilation parameters.") flags = tf.compat.v1.flags FLAGS = flags.FLAGS diff --git a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_full_1p.sh index acf6eef09..34cd7e302 100644 --- a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_full_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -120,7 +123,7 @@ do #执行训练脚本,以下传参不需要修改,其他需要模型审视修改 - python3 Hybrid-Spectral-Net.py --datapath=${data_path} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 + python3 Hybrid-Spectral-Net.py --datapath=${data_path} --dynamic_input=${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 done @@ -165,4 +168,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_performance_1p.sh index 6114bf636..c6362c04e 100644 --- a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/test/train_performance_1p.sh @@ -13,6 +13,7 @@ RANK_ID_START=0 # 数据集路径,保持为空,不需要修改 data_path='' ckpt_path='' +dynamic_input="1" #设置默认日志级别,不需要修改 export ASCEND_GLOBAL_LOG_LEVEL=3 @@ -78,6 +79,8 @@ do elif [[ $para == --ckpt_path* ]];then ckpt_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -120,7 +123,7 @@ do #执行训练脚本,以下传参不需要修改,其他需要模型审视修改 - python3 Hybrid-Spectral-Net.py --train_step=${train_steps} --datapath=${data_path} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 + python3 Hybrid-Spectral-Net.py --train_step=${train_steps} --datapath=${data_path} --dynamic_input=${dynamic_input} > ${cur_path}test/output/${ASCEND_DEVICE_ID}/train_${ASCEND_DEVICE_ID}.log 2>&1 done @@ -165,4 +168,5 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From 02a005ba8b18030cc61bbaf32f1a2004b2cfddc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Tue, 29 Mar 2022 01:57:38 +0000 Subject: [PATCH 21/33] dynamic_input --- .../Hybrid-Spectral-Net.py | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py index 61e9c76d0..5e4c27353 100644 --- a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py +++ b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py @@ -61,30 +61,8 @@ import scipy.io as sio # init_notebook_mode(connected=True) # %matplotlib inline from tensorflow.core.protobuf.rewriter_config_pb2 import RewriterConfig -import argparse -def init_arg(): - parser = argparse.ArgumentParser() - parser.add_argument("--dynamic_input", type=str, default='1', help="--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") - return parser.parse_args() - - -args = init_arg() - -config = tf.compat.v1.ConfigProto() -custom_op = config.graph_options.rewrite_options.custom_optimizers.add() -custom_op.name = "NpuOptimizer" -custom_op.parameter_map["use_off_line"].b = True -config.graph_options.rewrite_options.remapping = RewriterConfig.OFF -custom_op.parameter_map["dynamic_input"].b = True -if args.dynamic_input == "lazy_recompile": - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") -elif args.dynamic_input == "1": - custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") -else: - print("Enter correct compilation parameters.") - flags = tf.compat.v1.flags FLAGS = flags.FLAGS @@ -106,6 +84,23 @@ flags.DEFINE_integer( "train_step", 100, "total epochs for training") +flags.DEFINE_integer( + "--dynamic_input", "1", + "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") + +config = tf.compat.v1.ConfigProto() +custom_op = config.graph_options.rewrite_options.custom_optimizers.add() +custom_op.name = "NpuOptimizer" +custom_op.parameter_map["use_off_line"].b = True +config.graph_options.rewrite_options.remapping = RewriterConfig.OFF +custom_op.parameter_map["dynamic_input"].b = True +if FLAGS.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") +elif FLAGS.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") +else: + print("Enter correct compilation parameters.") + ## GLOBAL VARIABLES dataset = 'SA' -- Gitee From 0724000e55172a5a451eb5cbb67b2b962603e9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Tue, 29 Mar 2022 02:18:23 +0000 Subject: [PATCH 22/33] dynamic_input --- .../cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py index 5e4c27353..3de262a37 100644 --- a/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py +++ b/TensorFlow/contrib/cv/HybridSN_ID1160_for_TensorFlow/Hybrid-Spectral-Net.py @@ -85,7 +85,7 @@ flags.DEFINE_integer( "total epochs for training") flags.DEFINE_integer( - "--dynamic_input", "1", + "dynamic_input", "1", "--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph") config = tf.compat.v1.ConfigProto() -- Gitee From 86780ee92ff509a0c6c9195862a9eb02eaf46ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Tue, 29 Mar 2022 06:30:09 +0000 Subject: [PATCH 23/33] dynamic_input --- .../osmn_coco_pretrain.py | 13 ++++++++++++- .../test/train_full_1p.sh | 7 ++++++- .../test/train_performance_1p.sh | 9 +++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/osmn_coco_pretrain.py b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/osmn_coco_pretrain.py index 2e3809f4a..c7c891bf4 100644 --- a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/osmn_coco_pretrain.py +++ b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/osmn_coco_pretrain.py @@ -81,6 +81,12 @@ def add_arguments(parser): required=False, default=[0.8, 1, 1.2], help='Image scales for data augmentation') + group.add_argument( + '--dynamic_input', + type=str, + required=False, + default='1', + help='--dynamic_input=1 Use fuzzy compilation. --dynamic_input=lazy_recompile Compile using lazy static graph') print(" ".join(sys.argv[:])) @@ -115,7 +121,12 @@ config.gpu_options.per_process_gpu_memory_fraction = 0.9 custom_op = config.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = "NpuOptimizer" custom_op.parameter_map["dynamic_input"].b = 1 -custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") +if args.dynamic_input == "lazy_recompile": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") +elif args.dynamic_input == "1": + custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("dynamic_execute") +else: + print("Enter correct compilation parameters.") custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") #custom_op.parameter_map["mix_compile_mode"].b = True diff --git a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_full_1p.sh b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_full_1p.sh index 7ac40e7b2..e8e9cc883 100644 --- a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_full_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_full_1p.sh @@ -19,6 +19,7 @@ learning_rate= #参数配置 data_path="../data/" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_full_1p.sh --data_path=../data" @@ -29,6 +30,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -65,7 +68,8 @@ nohup python3 osmn_coco_pretrain.py --data_path ${data_path}/data/ \ --model_save_path $cur_path/models/ \ --training_iters $train_steps \ --display_iters 100 \ - --save_iters 50000 > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --save_iters 50000 \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) e2etime=$(( $end - $start )) @@ -107,3 +111,4 @@ echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${Cas echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2etime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file diff --git a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh index 5392e1960..5e1b04e5e 100644 --- a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh @@ -19,6 +19,7 @@ learning_rate= #参数配置 data_path="/data" +dynamic_input="1" if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_performance_1p.sh --data_path=../data" @@ -29,6 +30,8 @@ for para in $* do if [[ $para == --data_path* ]];then data_path=`echo ${para#*=}` + elif [[ $para == --dynamic_input* ]];then + dynamic_input=`echo ${para#*=}` fi done @@ -65,7 +68,8 @@ nohup python3 osmn_coco_pretrain.py --data_path $data_path/data/ \ --model_save_path $cur_path/models/ \ --training_iters $train_steps \ --display_iters 100 \ - --save_iters 500 > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & + --save_iters 500 \ + --dynamic_input ${dynamic_input} > $cur_path/test/output/$ASCEND_DEVICE_ID/train_$ASCEND_DEVICE_ID.log 2>&1 & wait end=$(date +%s) e2etime=$(( $end - $start )) @@ -106,4 +110,5 @@ echo "CaseName = ${CaseName}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseN echo "ActualFPS = ${ActualFPS}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainingTime = ${TrainingTime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "E2ETrainingTime = ${e2etime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "E2ETrainingTime = ${e2etime}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "DynamicInput = ${dynamic_input}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file -- Gitee From b1453edcc53c2a25f7401a1062e3bf65aa5dbc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 31 Mar 2022 03:03:28 +0000 Subject: [PATCH 24/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh index 88b902cb7..af0e060ca 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh @@ -1,6 +1,8 @@ #!/bin/bash cur_path=`pwd`/../ +export ASCEND_SLOG_PRINT_TO_STDOUT=1 +export ASCEND_GLOBAL_LOG_LEVEL=0 #基础参数,需要模型审视修改 #Batch Size batch_size=2 -- Gitee From 406588dc06e6d0297536bc18bce01e544aed990f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Wed, 6 Apr 2022 01:48:32 +0000 Subject: [PATCH 25/33] dynamic_input --- .../OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh index 5e1b04e5e..06f15be3a 100644 --- a/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/OSMN_ID1103_for_TensorFlow/test/train_performance_1p.sh @@ -1,6 +1,8 @@ #!/bin/bash cur_path=`pwd`/../ #export ASCEND_DEVICE_ID=3 +export ASCEND_SLOG_PRINT_TO_STDOUT=1 +export ASCEND_GLOBAL_LOG_LEVEL=0 #基础参数,需要模型审视修改 #Batch Size -- Gitee From ba6eae9a65443baa5c5659b0335b3dd53ce5e589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Wed, 6 Apr 2022 07:50:37 +0000 Subject: [PATCH 26/33] dynamic_input --- .../image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index 310f7a7de..e6b1199d4 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -66,12 +66,12 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - drop4 = Dropout(0.5)(conv4) + drop4 = npu_opt.dropout(0.5)(conv4) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - drop5 = Dropout(0.5)(conv5) + drop5 = npu_opt.dropout(0.5)(conv5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From b18fa1b8232b545c9e3eb8744269c564ac06ed96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 00:05:18 +0000 Subject: [PATCH 27/33] dynamic_input --- .../image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index e6b1199d4..6cc5f4bb2 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -66,12 +66,12 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - drop4 = npu_opt.dropout(0.5)(conv4) + drop4 = npu_ops.dropout(0.5)(conv4) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - drop5 = npu_opt.dropout(0.5)(conv5) + drop5 = npu_ops.dropout(0.5)(conv5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From 80011f468da07a5eabd4ec8e2a48f0ff467b2c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 01:08:48 +0000 Subject: [PATCH 28/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/model.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index 6cc5f4bb2..2e421a736 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -66,12 +66,14 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - drop4 = npu_ops.dropout(0.5)(conv4) + # drop4 = npu_ops.dropout(0.5)(conv4) + drop4 = npu_ops.dropout(conv4, 0.5) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - drop5 = npu_ops.dropout(0.5)(conv5) + # drop5 = npu_ops.dropout(0.5)(conv5) + drop5 = npu_ops.dropout(conv5, 0.5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From c6653073d328eb179bbf232d038c1d3bf4d5048e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 02:29:29 +0000 Subject: [PATCH 29/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/model.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index 2e421a736..0642b371f 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -66,14 +66,14 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - # drop4 = npu_ops.dropout(0.5)(conv4) - drop4 = npu_ops.dropout(conv4, 0.5) + drop4 = npu_ops.dropout(0.5)(conv4) + # drop4 = npu_ops.dropout(conv4, 0.5) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - # drop5 = npu_ops.dropout(0.5)(conv5) - drop5 = npu_ops.dropout(conv5, 0.5) + drop5 = npu_ops.dropout(0.5)(conv5) + # drop5 = npu_ops.dropout(conv5, 0.5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From 6d6adcd41e449c34d4a5263924429722ca60e43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 02:31:59 +0000 Subject: [PATCH 30/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/model.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index 0642b371f..aef13db31 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -66,13 +66,15 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - drop4 = npu_ops.dropout(0.5)(conv4) + drop4 = Dropout(0.5)(conv4) + # drop4 = npu_ops.dropout(0.5)(conv4) # drop4 = npu_ops.dropout(conv4, 0.5) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - drop5 = npu_ops.dropout(0.5)(conv5) + drop5 = Dropout(0.5)(conv5) + # drop5 = npu_ops.dropout(0.5)(conv5) # drop5 = npu_ops.dropout(conv5, 0.5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) -- Gitee From 72fa4dfd602057d036af0861d063d3cc1e200d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 03:02:51 +0000 Subject: [PATCH 31/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/model.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index aef13db31..a5344b2ea 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -28,6 +28,7 @@ # limitations under the License. # from npu_bridge.npu_init import * +from npu_bridge.estimator.npu import npu_convert_dropout import numpy as np import os import skimage.io as io @@ -66,16 +67,18 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - drop4 = Dropout(0.5)(conv4) + # drop4 = Dropout(0.5)(conv4) # drop4 = npu_ops.dropout(0.5)(conv4) # drop4 = npu_ops.dropout(conv4, 0.5) + drop4 = tf.keras.layers.Dropout(0.5)(conv4) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - drop5 = Dropout(0.5)(conv5) + # drop5 = Dropout(0.5)(conv5) # drop5 = npu_ops.dropout(0.5)(conv5) # drop5 = npu_ops.dropout(conv5, 0.5) + drop5 = tf.keras.layers.Dropout(0.5)(conv5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From b86b60f8879a9de648caaea780802620237be147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 06:04:30 +0000 Subject: [PATCH 32/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/model.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py index a5344b2ea..597ae0418 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/model.py @@ -67,18 +67,18 @@ def unet(pretrained_weights = None,input_size = (256,256,1)): pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool3) conv4 = Conv2D(512, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv4) - # drop4 = Dropout(0.5)(conv4) + drop4 = Dropout(0.5)(conv4) # drop4 = npu_ops.dropout(0.5)(conv4) # drop4 = npu_ops.dropout(conv4, 0.5) - drop4 = tf.keras.layers.Dropout(0.5)(conv4) + # drop4 = tf.keras.layers.Dropout(0.5)(conv4) pool4 = MaxPooling2D(pool_size=(2, 2))(drop4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(pool4) conv5 = Conv2D(1024, 3, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(conv5) - # drop5 = Dropout(0.5)(conv5) + drop5 = Dropout(0.5)(conv5) # drop5 = npu_ops.dropout(0.5)(conv5) # drop5 = npu_ops.dropout(conv5, 0.5) - drop5 = tf.keras.layers.Dropout(0.5)(conv5) + # drop5 = tf.keras.layers.Dropout(0.5)(conv5) up6 = Conv2D(512, 2, activation = 'relu', padding = 'same', kernel_initializer = 'he_normal')(UpSampling2D(size = (2,2))(drop5)) merge6 = concatenate([drop4,up6], axis = 3) -- Gitee From 1740a6c6654ba0516deee1d5e5951f2d7763bf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E6=96=87=E6=A0=8B?= <13298410087@163.com> Date: Thu, 7 Apr 2022 07:03:31 +0000 Subject: [PATCH 33/33] dynamic_input --- .../2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh index af0e060ca..7e23b40fe 100644 --- a/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/built-in/cv/image_segmentation/2D_Unet_ID2337_for_TensorFlow/test/train_performance_1p.sh @@ -22,6 +22,8 @@ learning_rate= data_path="" dynamic_input="1" +source /usr/local/Ascend/latest/bin/setenv.bash + if [[ $1 == --help || $1 == --h ]];then echo "usage:./train_performance_1p.sh --data_path=./datasets" exit 1 -- Gitee