From ff64ed266d033a0664f3b578e52ffd33de80710f Mon Sep 17 00:00:00 2001 From: mmglove Date: Wed, 21 Jul 2021 11:20:52 +0800 Subject: [PATCH 01/12] Revert "delete --privileged,test=document_fix (#1052)" This reverts commit f177e92ee13e8b39df1dd2553aeee6cb4e999ef2. --- scripts/docker_run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index 0d9a6b5f84..f43a80ed1d 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -199,6 +199,7 @@ function run_models(){ -e "DEVICE_TYPE=${device_type}" \ -e "VERSION_CUDA=${cuda_version}" \ --net=host \ + --privileged \ --shm-size=128G \ ${RUN_IMAGE_NAME} \ /bin/bash -c "${run_cmd}" @@ -222,6 +223,7 @@ function run_models(){ -e "DEVICE_TYPE=${device_type}" \ -e "VERSION_CUDA=${cuda_version}" \ --net=host \ + --privileged \ --shm-size=128G \ ${RUN_IMAGE_NAME} \ /bin/bash -c "${run_cmd}" @@ -242,6 +244,7 @@ function run_models(){ -e "DEVICE_TYPE=${device_type}" \ -e "VERSION_CUDA=${cuda_version}" \ --net=host \ + --privileged \ --shm-size=128G \ ${RUN_IMAGE_NAME} \ /bin/bash -c "${run_cmd}" From 30cf367626dfbc42e4ca030d08805f7a44000e41 Mon Sep 17 00:00:00 2001 From: mmglove Date: Thu, 30 Sep 2021 18:06:37 +0800 Subject: [PATCH 02/12] add docker home path, test=document_fix --- scripts/docker_run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index be162e117e..b5afe0cf9f 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -189,6 +189,7 @@ function run_models(){ if [[ ${device_type} == 'cpu' || ${device_type} == "CPU" ]]; then RUN_IMAGE_NAME=paddlepaddle/paddle:latest docker run -i --rm \ + -v /home:/home \ -v ${all_path}:${all_path} \ -v /usr/bin/monquery:/usr/bin/monquery \ -e "BENCHMARK_WEBSITE1=${BENCHMARK_WEBSITE1}" \ @@ -212,6 +213,7 @@ function run_models(){ if [ ${device_type} == "A100" ]; then nvidia-docker run --runtime=nvidia --gpus all -i --rm \ + -v /home:/home \ -v ${all_path}:${all_path} \ -v /usr/bin/nvidia-smi:/usr/bin/nvidia-smi \ -v /usr/bin/monquery:/usr/bin/monquery \ @@ -233,6 +235,7 @@ function run_models(){ /bin/bash -c "${run_cmd}" else nvidia-docker run -i --rm \ + -v /home:/home \ -v ${all_path}:${all_path} \ -v /usr/bin/nvidia-smi:/usr/bin/nvidia-smi \ -v /usr/bin/monquery:/usr/bin/monquery \ From 8a14fcafe938bff173af78e3b9ee19d3bc79682d Mon Sep 17 00:00:00 2001 From: mmglove Date: Fri, 29 Oct 2021 14:02:20 +0800 Subject: [PATCH 03/12] test add seg case,test=document_fix --- scripts/auto_run_paddle.sh | 4 +++- scripts/dynamic_graph_models.sh | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/auto_run_paddle.sh b/scripts/auto_run_paddle.sh index 5ce61175a0..3f78ec7c40 100644 --- a/scripts/auto_run_paddle.sh +++ b/scripts/auto_run_paddle.sh @@ -85,7 +85,9 @@ function prepare(){ mkdir -p ${ROOT_PATH} cd ${ROOT_PATH} rm -rf * - git clone https://github.com/PaddlePaddle/benchmark.git --recursive + # 拉私有库进行调试 +# git clone https://github.com/PaddlePaddle/benchmark.git --recursive + git clone https://github.com/mmglove/benchmark.git -b jp_seg_test --recursive mkdir -p ${log_path} echo "****************${implement_type} prepare had done*****************" diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 67dbc73624..08e859da91 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -14,7 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn) +#cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn) +cur_model_list=(dy_seg_q4) + +dy_seg_q4(){ + cd ${ROOT_PATH}/ + cp -r /ssd3/guomengmeng01/test_jp/seg_jp_0927/paddle_seg/PaddleSeg ./ +# git clone https://github.com/PaddlePaddle/PaddleSeg.git -b develop + cur_model_path=${ROOT_PATH}/PaddleSeg + cd ${cur_model_path} + bash benchmark/run_all.sh +} + #run_bert dy_bert(){ From 2117f777157c00ead5120187c8ffa7e96f5ec131 Mon Sep 17 00:00:00 2001 From: mmglove Date: Fri, 29 Oct 2021 17:37:33 +0800 Subject: [PATCH 04/12] test add seg case,test=document_fix --- scripts/dynamic_graph_models.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 08e859da91..5335126cee 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -19,7 +19,7 @@ cur_model_list=(dy_seg_q4) dy_seg_q4(){ cd ${ROOT_PATH}/ - cp -r /ssd3/guomengmeng01/test_jp/seg_jp_0927/paddle_seg/PaddleSeg ./ + cp -r /ssd2/benchmark_material/temp_gmm/PaddleSeg ./ # git clone https://github.com/PaddlePaddle/PaddleSeg.git -b develop cur_model_path=${ROOT_PATH}/PaddleSeg cd ${cur_model_path} From 0e72a8a87f3d75e439af5f6857e5bb4725b9302c Mon Sep 17 00:00:00 2001 From: mmglove Date: Fri, 29 Oct 2021 17:40:40 +0800 Subject: [PATCH 05/12] test add seg case,test=document_fix --- scripts/docker_run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index b5afe0cf9f..316e422ba8 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -76,6 +76,10 @@ function construnct_version(){ PADDLE_VERSION=${version}'.post'$(echo ${cuda_version} | sed 's/\.//g')${cudnn_version}".${image_branch//-/_}.${image_commit_id6}" IMAGE_NAME=paddlepaddle_gpu-0.0.0.${PADDLE_VERSION}-cp27-cp27mu-linux_x86_64.whl fi + ####### + 选择特定的paddle包 + IMAGE_NAME=paddlepaddle_gpu-0.0.0.2021.1029.142209.post107.develop.89a898-cp37-cp37m-linux_x86_64.whl + ####### PADDLE_DEV_NAME=paddlepaddle/paddle_manylinux_devel:${whl_build_tag} echo "-----------------build IMAGE_NAME is: ${IMAGE_NAME}" echo "-----------------build PADDLE_DEV_NAME is: ${PADDLE_DEV_NAME}" From f7a1ae945cf98d6554921cbb8fc392d1eb8914b7 Mon Sep 17 00:00:00 2001 From: mmglove Date: Fri, 29 Oct 2021 20:07:06 +0800 Subject: [PATCH 06/12] test add seg case,test=document_fix --- scripts/auto_run_paddle.sh | 4 ++++ scripts/docker_run.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/auto_run_paddle.sh b/scripts/auto_run_paddle.sh index 3f78ec7c40..32fc4051f0 100644 --- a/scripts/auto_run_paddle.sh +++ b/scripts/auto_run_paddle.sh @@ -162,6 +162,10 @@ function run(){ function save(){ unset http_proxy unset https_proxy + echo "#################log_path################" + ls ${log_path} + cp -r ${log_path}/* ${save_log_dir}/index +############ mv ${log_path} ${save_log_dir}/index ln -s ${all_path}/env/bin/python /usr/local/bin/mypython export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${all_path}/env/lib/ diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index 316e422ba8..bafef21504 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -77,7 +77,7 @@ function construnct_version(){ IMAGE_NAME=paddlepaddle_gpu-0.0.0.${PADDLE_VERSION}-cp27-cp27mu-linux_x86_64.whl fi ####### - 选择特定的paddle包 + # 选择特定的paddle包 IMAGE_NAME=paddlepaddle_gpu-0.0.0.2021.1029.142209.post107.develop.89a898-cp37-cp37m-linux_x86_64.whl ####### PADDLE_DEV_NAME=paddlepaddle/paddle_manylinux_devel:${whl_build_tag} From 5417a4f71f41fc2554082fe61f319abb45251998 Mon Sep 17 00:00:00 2001 From: mmglove Date: Mon, 1 Nov 2021 19:12:03 +0800 Subject: [PATCH 07/12] test add seg case,test=document_fix --- scripts/auto_run_paddle.sh | 14 ++++++++------ scripts/static_graph_models.sh | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/auto_run_paddle.sh b/scripts/auto_run_paddle.sh index 32fc4051f0..016e00fa4e 100644 --- a/scripts/auto_run_paddle.sh +++ b/scripts/auto_run_paddle.sh @@ -73,11 +73,15 @@ function prepare(){ mkdir -p ${PROFILER_LOG_DIR} train_log_dir=${save_log_dir}/train_log + # speed log + export log_path=${save_log_dir}/index + mkdir -p ${log_path} + echo "#################log_path:################" ${log_path} + # mkdir -p ${train_log_dir} export ROOT_PATH=/home/crim export BENCHMARK_ROOT=${ROOT_PATH}/benchmark - log_path=${BENCHMARK_ROOT}/${implement_type}/logs data_path=${all_path}/dataset prepare_path=${all_path}/prepare @@ -88,7 +92,7 @@ function prepare(){ # 拉私有库进行调试 # git clone https://github.com/PaddlePaddle/benchmark.git --recursive git clone https://github.com/mmglove/benchmark.git -b jp_seg_test --recursive - mkdir -p ${log_path} + echo "****************${implement_type} prepare had done*****************" cd ${BENCHMARK_ROOT} @@ -162,11 +166,9 @@ function run(){ function save(){ unset http_proxy unset https_proxy - echo "#################log_path################" + echo "#################log_path:################" ${log_path} ls ${log_path} - cp -r ${log_path}/* ${save_log_dir}/index -############ - mv ${log_path} ${save_log_dir}/index + ln -s ${all_path}/env/bin/python /usr/local/bin/mypython export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${all_path}/env/lib/ cd ${origin_path} diff --git a/scripts/static_graph_models.sh b/scripts/static_graph_models.sh index a1026feb63..820970a821 100644 --- a/scripts/static_graph_models.sh +++ b/scripts/static_graph_models.sh @@ -361,7 +361,7 @@ ddpg_deep_explore(){ CUDA_VISIBLE_DEVICES=0 bash run_benchmark.sh 1 sp ${train_log_dir} | tee ${log_path}/${FUNCNAME}_speed_1gpus 2>&1 } -#run_paddingrnn +#run_paddingrnn 已下线 paddingrnn(){ cur_model_path=${BENCHMARK_ROOT}/PaddleNLP/legacy/language_model cd ${cur_model_path} @@ -387,7 +387,7 @@ paddingrnn(){ -# seq2seq +# seq2seq 已下线 seq2seq(){ cur_model_path=${BENCHMARK_ROOT}/PaddleNLP/legacy/seq2seq/seq2seq/ cd ${cur_model_path} From 4669261f7fd3de5aa1254e86925f2c95582bb2e0 Mon Sep 17 00:00:00 2001 From: mmglove Date: Wed, 3 Nov 2021 15:03:19 +0800 Subject: [PATCH 08/12] test add seg case,test=document_fix --- scripts/auto_run_paddle.sh | 16 ++++++---------- scripts/dynamic_graph_models.sh | 9 +++++++-- scripts/save.py | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/auto_run_paddle.sh b/scripts/auto_run_paddle.sh index 016e00fa4e..ccf28e940c 100644 --- a/scripts/auto_run_paddle.sh +++ b/scripts/auto_run_paddle.sh @@ -67,18 +67,14 @@ function prepare(){ # this for update the log_path coding mat export TRAIN_LOG_DIR=${save_log_dir}/train_log export PROFILER_LOG_DIR=${save_log_dir}/profiler_log + export LOG_PATH_INDEX_DIR=${save_log_dir}/index # speed log export IMPLEMENT_TYPE=${implement_type} + export RUN_PROFILER=no_profil # 需要改成从TC任务中可设置的参数 mkdir -p ${TRAIN_LOG_DIR} mkdir -p ${PROFILER_LOG_DIR} - - train_log_dir=${save_log_dir}/train_log - # speed log - export log_path=${save_log_dir}/index - mkdir -p ${log_path} - echo "#################log_path:################" ${log_path} - - # mkdir -p ${train_log_dir} + mkdir -p ${LOG_PATH_INDEX_DIR} + echo "#################LOG_PATH_INDEX_DIR:################" ${LOG_PATH_INDEX_DIR} export ROOT_PATH=/home/crim export BENCHMARK_ROOT=${ROOT_PATH}/benchmark @@ -166,8 +162,8 @@ function run(){ function save(){ unset http_proxy unset https_proxy - echo "#################log_path:################" ${log_path} - ls ${log_path} + echo "#################log_path:################" ${LOG_PATH_INDEX_DIR} + ls ${LOG_PATH_INDEX_DIR} ln -s ${all_path}/env/bin/python /usr/local/bin/mypython export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${all_path}/env/lib/ diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 5335126cee..00f6aa6fd4 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -16,13 +16,18 @@ #cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn) cur_model_list=(dy_seg_q4) +if [ ${RUN_PROFILER} = "PROFILER" ]; then + log_path=${PROFILER_LOG_DIR:-$(pwd)} # benchmark系统指定该参数,如果需要跑profile时,log_path指向存profile的目录 +fi +log_path=${LOG_PATH_INDEX_DIR:-$(pwd)} # benchmark系统指定该参数,不需要跑profile时,log_path指向存speed的目录 dy_seg_q4(){ cd ${ROOT_PATH}/ - cp -r /ssd2/benchmark_material/temp_gmm/PaddleSeg ./ -# git clone https://github.com/PaddlePaddle/PaddleSeg.git -b develop +# 基于自己的PR调试 + git clone https://github.com/mmglove/PaddleSeg.git -b bk_seg_test cur_model_path=${ROOT_PATH}/PaddleSeg cd ${cur_model_path} + sed -i '/set\ -xe/d' benchmark/run_benchmark.sh bash benchmark/run_all.sh } diff --git a/scripts/save.py b/scripts/save.py index 3f0d73af12..c87fb268df 100644 --- a/scripts/save.py +++ b/scripts/save.py @@ -418,6 +418,7 @@ def parse_logs(args): """ image_id = get_image_id() file_list = load_folder_files(os.path.join(args.log_path, "index")) + print("###########3parse_logs:###########", file_list) html_results = OrderedDict() icafe_results = [] for k in DICT_INDEX.values(): From 62ecf06031022391ec2f5be17b8d9d789adaa2d8 Mon Sep 17 00:00:00 2001 From: mmglove Date: Wed, 3 Nov 2021 19:31:52 +0800 Subject: [PATCH 09/12] add seg case,update seg repo,test=document_fix --- .gitmodules | 2 +- PaddleSeg | 2 +- scripts/auto_run_paddle.sh | 9 ++------- scripts/docker_run.sh | 2 +- scripts/dynamic_graph_models.sh | 17 +++++++---------- scripts/save.py | 1 - 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4b99ba60ed..cff38161cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -69,7 +69,7 @@ [submodule "PaddleSeg"] path = PaddleSeg url = https://github.com/PaddlePaddle/PaddleSeg.git - branch = benchmark + branch = develop [submodule "PaddleOCR"] path = PaddleOCR url = https://github.com/PaddlePaddle/PaddleOCR.git diff --git a/PaddleSeg b/PaddleSeg index 5a38454adc..39addba256 160000 --- a/PaddleSeg +++ b/PaddleSeg @@ -1 +1 @@ -Subproject commit 5a38454adc39711293a5c0bf898bf9c99d2ba244 +Subproject commit 39addba256424dec4c5eb0fdbde445e29b93c33a diff --git a/scripts/auto_run_paddle.sh b/scripts/auto_run_paddle.sh index ccf28e940c..fa119411e0 100644 --- a/scripts/auto_run_paddle.sh +++ b/scripts/auto_run_paddle.sh @@ -69,7 +69,7 @@ function prepare(){ export PROFILER_LOG_DIR=${save_log_dir}/profiler_log export LOG_PATH_INDEX_DIR=${save_log_dir}/index # speed log export IMPLEMENT_TYPE=${implement_type} - export RUN_PROFILER=no_profil # 需要改成从TC任务中可设置的参数 + export RUN_PROFILER=no_profil # 后续需要加profiler任务的时候改成从TC任务中可设置的参数 mkdir -p ${TRAIN_LOG_DIR} mkdir -p ${PROFILER_LOG_DIR} @@ -85,10 +85,8 @@ function prepare(){ mkdir -p ${ROOT_PATH} cd ${ROOT_PATH} rm -rf * - # 拉私有库进行调试 -# git clone https://github.com/PaddlePaddle/benchmark.git --recursive - git clone https://github.com/mmglove/benchmark.git -b jp_seg_test --recursive + git clone https://github.com/PaddlePaddle/benchmark.git --recursive echo "****************${implement_type} prepare had done*****************" cd ${BENCHMARK_ROOT} @@ -162,9 +160,6 @@ function run(){ function save(){ unset http_proxy unset https_proxy - echo "#################log_path:################" ${LOG_PATH_INDEX_DIR} - ls ${LOG_PATH_INDEX_DIR} - ln -s ${all_path}/env/bin/python /usr/local/bin/mypython export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${all_path}/env/lib/ cd ${origin_path} diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index bafef21504..56fcde6b3a 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -78,7 +78,7 @@ function construnct_version(){ fi ####### # 选择特定的paddle包 - IMAGE_NAME=paddlepaddle_gpu-0.0.0.2021.1029.142209.post107.develop.89a898-cp37-cp37m-linux_x86_64.whl +# IMAGE_NAME=paddlepaddle_gpu-0.0.0.2021.1029.142209.post107.develop.89a898-cp37-cp37m-linux_x86_64.whl ####### PADDLE_DEV_NAME=paddlepaddle/paddle_manylinux_devel:${whl_build_tag} echo "-----------------build IMAGE_NAME is: ${IMAGE_NAME}" diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 00f6aa6fd4..d9aa2e8550 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -14,18 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -#cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn) -cur_model_list=(dy_seg_q4) -if [ ${RUN_PROFILER} = "PROFILER" ]; then - log_path=${PROFILER_LOG_DIR:-$(pwd)} # benchmark系统指定该参数,如果需要跑profile时,log_path指向存profile的目录 -fi +cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn dy_seg_repo) +#if [ ${RUN_PROFILER} = "PROFILER" ]; then +# log_path=${PROFILER_LOG_DIR:-$(pwd)} # benchmark系统指定该参数,如果需要跑profile时,log_path指向存profile的目录 +#fi log_path=${LOG_PATH_INDEX_DIR:-$(pwd)} # benchmark系统指定该参数,不需要跑profile时,log_path指向存speed的目录 -dy_seg_q4(){ - cd ${ROOT_PATH}/ -# 基于自己的PR调试 - git clone https://github.com/mmglove/PaddleSeg.git -b bk_seg_test - cur_model_path=${ROOT_PATH}/PaddleSeg +dy_seg_repo(){ + echo "dy_seg_repo" + cur_model_path=${BENCHMARK_ROOT}/PaddleSeg/ cd ${cur_model_path} sed -i '/set\ -xe/d' benchmark/run_benchmark.sh bash benchmark/run_all.sh diff --git a/scripts/save.py b/scripts/save.py index c87fb268df..3f0d73af12 100644 --- a/scripts/save.py +++ b/scripts/save.py @@ -418,7 +418,6 @@ def parse_logs(args): """ image_id = get_image_id() file_list = load_folder_files(os.path.join(args.log_path, "index")) - print("###########3parse_logs:###########", file_list) html_results = OrderedDict() icafe_results = [] for k in DICT_INDEX.values(): From d1a7da4e550784218298f4967c60c013f49986a4 Mon Sep 17 00:00:00 2001 From: mmglove Date: Wed, 3 Nov 2021 19:33:49 +0800 Subject: [PATCH 10/12] test add seg case,test=document_fix --- scripts/docker_run.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/docker_run.sh b/scripts/docker_run.sh index 56fcde6b3a..b5afe0cf9f 100644 --- a/scripts/docker_run.sh +++ b/scripts/docker_run.sh @@ -76,10 +76,6 @@ function construnct_version(){ PADDLE_VERSION=${version}'.post'$(echo ${cuda_version} | sed 's/\.//g')${cudnn_version}".${image_branch//-/_}.${image_commit_id6}" IMAGE_NAME=paddlepaddle_gpu-0.0.0.${PADDLE_VERSION}-cp27-cp27mu-linux_x86_64.whl fi - ####### - # 选择特定的paddle包 -# IMAGE_NAME=paddlepaddle_gpu-0.0.0.2021.1029.142209.post107.develop.89a898-cp37-cp37m-linux_x86_64.whl - ####### PADDLE_DEV_NAME=paddlepaddle/paddle_manylinux_devel:${whl_build_tag} echo "-----------------build IMAGE_NAME is: ${IMAGE_NAME}" echo "-----------------build PADDLE_DEV_NAME is: ${PADDLE_DEV_NAME}" From 83393eb98fb7c7a71267d1b5aa299ae2e71c7112 Mon Sep 17 00:00:00 2001 From: mmglove Date: Thu, 4 Nov 2021 14:55:52 +0800 Subject: [PATCH 11/12] test_1104 --- scripts/dynamic_graph_models.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 4e883faa4c..313c95662f 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -28,10 +28,6 @@ dy_seg_repo(){ sed -i '/set\ -xe/d' benchmark/run_benchmark.sh bash benchmark/run_all.sh } -<<<<<<< HEAD - -======= ->>>>>>> 6cedde54a9d3ac781e4bf5fa2f64f8aa4733116c #run_bert dy_bert(){ From 40f8791bf4c282fdbfbc75fd2d995d6db9bca77b Mon Sep 17 00:00:00 2001 From: mmglove Date: Mon, 8 Nov 2021 19:35:44 +0800 Subject: [PATCH 12/12] add_pwgan_1108,test=document_fix --- .gitmodules | 4 ++++ DeepSpeech | 1 + scripts/dynamic_graph_models.sh | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 160000 DeepSpeech diff --git a/.gitmodules b/.gitmodules index 592b47c5d1..37183c42a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -84,6 +84,10 @@ path = PaddleGAN url = https://github.com/PaddlePaddle/PaddleGAN.git branch = develop +[submodule "DeepSpeech"] + path = DeepSpeech + url = https://github.com/PaddlePaddle/DeepSpeech.git + branch = develop [submodule "OtherFrame/nlp/PyTorch/scripts/NLP/gpt/Megatron-LM"] path = OtherFrame/nlp/PyTorch/models/NLP/gpt/Megatron-LM url = https://github.com/NVIDIA/Megatron-LM.git diff --git a/DeepSpeech b/DeepSpeech new file mode 160000 index 0000000000..c5f7d95084 --- /dev/null +++ b/DeepSpeech @@ -0,0 +1 @@ +Subproject commit c5f7d950844bfbd9b07569f166a90e255afc1974 diff --git a/scripts/dynamic_graph_models.sh b/scripts/dynamic_graph_models.sh index 39342d8e79..451581030f 100644 --- a/scripts/dynamic_graph_models.sh +++ b/scripts/dynamic_graph_models.sh @@ -15,7 +15,7 @@ # limitations under the License. -cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn dy_gpt dy_seg_repo) +cur_model_list=(dy_bert dy_lac dy_transformer dy_wavenet dy_senta dy_mask_rcnn dy_yolov3 dy_slowfast dy_tsn dy_tsm dy_gan dy_seg dy_seq2seq dy_resnet dy_ptb_medium dy_mobilenet dy_ppocr_mobile_2 dy_bmn dy_faster_rcnn_fpn dy_gpt dy_seg_repo dy_speech_repo_pwgan) #if [ ${RUN_PROFILER} = "PROFILER" ]; then # log_path=${PROFILER_LOG_DIR:-$(pwd)} # benchmark系统指定该参数,如果需要跑profile时,log_path指向存profile的目录 #fi @@ -29,6 +29,12 @@ dy_seg_repo(){ bash benchmark/run_all.sh } +dy_speech_repo_pwgan(){ + echo "dy_speech_repo_pwgan" + cur_model_path=${BENCHMARK_ROOT}/DeepSpeech/ + cd ${cur_model_path}/tests/benchmark/pwgan/ + bash run_all.sh +} #run_bert dy_bert(){ cur_model_path=${BENCHMARK_ROOT}/PaddleNLP/examples/language_model/bert/