From 66ffe5b9a8b1841c16e722a480862bc9346e7a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 08:30:48 +0000 Subject: [PATCH 01/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../test/train_full_1p.sh | 53 +++++++++++++++++-- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index c663be49d..b34480427 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -113,13 +113,51 @@ epochs=700 if [ x"${modelarts_flag}" != x ]; then - python3.7 ./run_symnet.py --name UT_best --data UT --epoch=${epochs} --obj_pred UT_obj_lr1e-3_test_ep260.pkl --trained_weight snapshot_epoch_586.ckpt --batchnorm --wordvec onehot --lr 1e-4 --bz=${batch_size} --lambda_cls_attr 1 --lambda_cls_obj 0.5 --lambda_trip 0.5 --lambda_sym 0.01 --lambda_axiom 0.03 --data_url=${data_path} --train_url=${output_path} -# python3.7 ./test_symnet.py --name UT_best --data UT --epoch=${epochs} --obj_pred UT_obj_lr1e-3_test_ep260.pkl --wordvec onehot --batchnorm --data_url=${data_path} --train_url=${output_path} + echo -------123456-------- + python3.7 ./run_symnet.py --name UT_best \ + --data UT \ + --epoch=${epochs} \ + --obj_pred UT_obj_lr1e-3_test_ep260.pkl \ + --trained_weight snapshot_epoch_586.ckpt \ + --batchnorm \ + --wordvec onehot \ + --lr 1e-4 \ + --bz=${batch_size} \ + --lambda_cls_attr 1 \ + --lambda_cls_obj 0.5 \ + --lambda_trip 0.5 \ + --lambda_sym 0.01 \ + --lambda_axiom 0.03 \ + --data_url=${data_path} \ + --train_url=${output_path} 1>${print_log} 2>&1 +# python3.7 ./test_symnet.py --name UT_best \ + --data UT \ + --epoch 600 \ + --obj_pred UT_lr1e-3_ep140.pkl \ + --wordvec onehot \ + --batchnorm >>${print_log} 2>&1 else - python3.7 ./run_symnet.py --name UT_best --data UT --epoch${epochs} --obj_pred UT_obj_lr1e-3_test_ep260.pkl --trained_weight snapshot_epoch_586.ckpt --batchnorm --wordvec onehot --lr 1e-4 --bz=${batch_size} --lambda_cls_attr 1 --lambda_cls_obj 0.5 --lambda_trip 0.5 --lambda_sym 0.01 --lambda_axiom 0.03 --data_url=${data_path} --train_url=${output_path} 1>${print_log} 2>&1 -# python3.7 ./test_symnet.py --name UT_best --data UT --epoch=${epochs} --obj_pred UT_obj_lr1e-3_test_ep260.pkl --wordvec onehot --batchnorm --data_url=${data_path} --train_url=${output_path} + echo --------1234567---------- + python3.7 ./run_symnet.py --name UT_best \ + --data UT \ + --epoch=${epochs} \ + --obj_pred UT_obj_lr1e-3_test_ep260.pkl \ + --trained_weight snapshot_epoch_586.ckpt \ + --batchnorm \ + --wordvec onehot \ + --lr 1e-4 \ + --bz=${batch_size} \ + --lambda_cls_attr 1 \ + --lambda_cls_obj 0.5 \ + --lambda_trip 0.5 \ + --lambda_sym 0.01 \ + --lambda_axiom 0.03 \ + --data_url=${data_path} \ + --train_url=${output_path} 1>${print_log} 2>&1 + fi + # 性能相关数据计算 StepTime=`grep "sec/step :" ${print_log} | tail -n 20 | awk -F ':' '{print $NF}' | awk '{sum+=$1} END {print sum/NR}'` FPS=`awk 'BEGIN{printf "%.2f\n", '${batch_size}'/'${StepTime}'}'` @@ -184,4 +222,9 @@ echo "ActualFPS = ${FPS}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainingTime = ${StepTime}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log \ No newline at end of file +echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +cd / +if [ -d ./cache/profiling ] +then + rm -rf ./cache +fi -- Gitee From 60492afccb459e1349ab61c30baaeb2310b738fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 08:35:37 +0000 Subject: [PATCH 02/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py. --- .../contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py index 7556ce8d1..def3bc0f2 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/run_symnet.py @@ -180,7 +180,7 @@ if args.ifNPU == True: profiling_dir = "/cache/profiling" os.makedirs(profiling_dir) -import moxing as mox +#import moxing as mox ############################################################ @@ -206,7 +206,7 @@ def main(): sw = SolverWrapper(net, train_dataloader, test_dataloader, args) sw.trainval_model(sess, args.epoch) - mox.file.copy_parallel(profiling_dir, args.train_url) + #mox.file.copy_parallel(profiling_dir, args.train_url) ################################################################################ -- Gitee From 89ceaf42783f7ef5a1e18acbf66e00824ce4b7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 08:58:35 +0000 Subject: [PATCH 03/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index b34480427..a35c409f1 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -131,11 +131,11 @@ then --data_url=${data_path} \ --train_url=${output_path} 1>${print_log} 2>&1 # python3.7 ./test_symnet.py --name UT_best \ - --data UT \ - --epoch 600 \ - --obj_pred UT_lr1e-3_ep140.pkl \ - --wordvec onehot \ - --batchnorm >>${print_log} 2>&1 + #--data UT \ + #--epoch 600 \ + #--obj_pred UT_lr1e-3_ep140.pkl \ + #--wordvec onehot \ + #--batchnorm >>${print_log} 2>&1 else echo --------1234567---------- python3.7 ./run_symnet.py --name UT_best \ -- Gitee From 5f4426787dff38648991bd8417d84d54213cad41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 09:23:16 +0000 Subject: [PATCH 04/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt. --- .../cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt index a90c02fe5..4829dd3a1 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/pip-requirements.txt @@ -1,3 +1,3 @@ torch==1.10.0 -torchvision==0.11.3 +torchvision==0.6.0a0 numpy==1.21.2 \ No newline at end of file -- Gitee From ba889ef64ec75ab8d66db73acb0c7144fd6e9760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 09:35:37 +0000 Subject: [PATCH 05/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index a35c409f1..ad8b4b564 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -128,7 +128,7 @@ then --lambda_trip 0.5 \ --lambda_sym 0.01 \ --lambda_axiom 0.03 \ - --data_url=${data_path} \ + --data_url=${data_path}/data \ --train_url=${output_path} 1>${print_log} 2>&1 # python3.7 ./test_symnet.py --name UT_best \ #--data UT \ -- Gitee From 22a37e92c3a52b9c6d69383fb9aeb1142157f8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 03:36:53 +0000 Subject: [PATCH 06/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index ad8b4b564..4cb4fd9bd 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -7,7 +7,13 @@ ########################################################## # shell脚本所在路径 cur_path=`echo $(cd $(dirname $0);pwd)` - +cd / +if [ -d ./cache/profiling ] +then + rm -rf ./cache +fi +cd ${cur_path} +#cur_path=`echo $(cd $(dirname $0);pwd)` # 判断当前shell是否是performance perf_flag=`echo $0 | grep performance | wc -l` -- Gitee From f7ae038953a65ba5117eb8d744155b91588a3896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 05:03:51 +0000 Subject: [PATCH 07/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index 4cb4fd9bd..9b94489a9 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -134,7 +134,7 @@ then --lambda_trip 0.5 \ --lambda_sym 0.01 \ --lambda_axiom 0.03 \ - --data_url=${data_path}/data \ + --data_url=${data_path} \ --train_url=${output_path} 1>${print_log} 2>&1 # python3.7 ./test_symnet.py --name UT_best \ #--data UT \ -- Gitee From 0435629106694f17ab2de4d40c40cfecd7d95e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 05:50:14 +0000 Subject: [PATCH 08/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index 9b94489a9..4cb4fd9bd 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -134,7 +134,7 @@ then --lambda_trip 0.5 \ --lambda_sym 0.01 \ --lambda_axiom 0.03 \ - --data_url=${data_path} \ + --data_url=${data_path}/data \ --train_url=${output_path} 1>${print_log} 2>&1 # python3.7 ./test_symnet.py --name UT_best \ #--data UT \ -- Gitee From 7fc97a79f5e516896b2c6c9d5ddc52e795b4834a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 06:29:20 +0000 Subject: [PATCH 09/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index 4cb4fd9bd..07f5ecb01 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -158,7 +158,7 @@ else --lambda_trip 0.5 \ --lambda_sym 0.01 \ --lambda_axiom 0.03 \ - --data_url=${data_path} \ + --data_url=${data_path}/data \ --train_url=${output_path} 1>${print_log} 2>&1 fi -- Gitee From 32dd40079ae9c3166902890748d2e52b4e36cb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 06:36:36 +0000 Subject: [PATCH 10/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index 07f5ecb01..9cadb2a93 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -134,7 +134,7 @@ then --lambda_trip 0.5 \ --lambda_sym 0.01 \ --lambda_axiom 0.03 \ - --data_url=${data_path}/data \ + --data_url=${data_path}/data/ \ --train_url=${output_path} 1>${print_log} 2>&1 # python3.7 ./test_symnet.py --name UT_best \ #--data UT \ -- Gitee From 6e42f9415014876b72bd7867794a141c8d377dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 07:18:19 +0000 Subject: [PATCH 11/12] update TensorFlow/contrib/cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh. --- .../cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh index 4a72627bf..8b1e18d92 100644 --- a/TensorFlow/contrib/cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/UDCVO_ID2359_for_TensorFlow/test/train_performance_1p.sh @@ -141,7 +141,7 @@ then --rot_param exponential \ --n_summary 10 \ --n_checkpoint 50 \ - --checkpoint_path /home/ma-user/modelarts/outputs/train_url_0/ + --checkpoint_path /home/ma-user/modelarts/outputs/train_url_0/ >${print_log} 2>&1 else #python3.7 ./LeNet.py --data_path=${data_path} --output_path=${output_path} --steps=${train_steps} > ${print_log} python3.7 src/train_voiced.py \ -- Gitee From abc21d52a1af8f12709bf63e75cecbb8dc1509ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E6=B4=8B?= <10527367+yang-yang-zhang123456@user.noreply.gitee.com> Date: Wed, 6 Apr 2022 00:56:59 +0000 Subject: [PATCH 12/12] update TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh. --- .../cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh index 9cadb2a93..fc25ec469 100644 --- a/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh +++ b/TensorFlow/contrib/cv/SYMNET_ID1292_for_Tensorflow/test/train_full_1p.sh @@ -228,7 +228,7 @@ echo "ActualFPS = ${FPS}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "TrainingTime = ${StepTime}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "ActualLoss = ${ActualLoss}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log echo "E2ETrainingTime = ${e2e_time}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log -echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/test/output/$ASCEND_DEVICE_ID/${CaseName}.log +echo "TrainAccuracy = ${train_accuracy}" >> $cur_path/output/$ASCEND_DEVICE_ID/${CaseName}.log cd / if [ -d ./cache/profiling ] then -- Gitee