From ffa4784515953218b25f1478a383ca5e16cbdb1c Mon Sep 17 00:00:00 2001 From: zjjlivein <1834792141@qq.com> Date: Wed, 1 Feb 2023 15:46:07 +0800 Subject: [PATCH 1/3] upodate install ways --- scripts/regression/run_ci.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/regression/run_ci.sh b/scripts/regression/run_ci.sh index fdab31d1a562..bc202c59eaec 100644 --- a/scripts/regression/run_ci.sh +++ b/scripts/regression/run_ci.sh @@ -98,12 +98,13 @@ upload (){ build_dev_path=/workspace/PaddleNLP_dev nlp_build ${build_dev_path} nlp_version=$(python -c "from paddlenlp import __version__; print(__version__)") - cp $build_dev_path/dist/p****.whl ${PPNLP_HOME}/upload/ + # for test https://www.paddlepaddle.org.cn/whl/paddlenlp.html + cp $build_dev_path/dist/p****.whl ${PPNLP_HOME}/upload/ + # for ci pr test + cp $build_dev_path/dist/p****.whl ${PPNLP_HOME}/upload/paddlenlp-ci-py3-none-any.whl echo -e "\033[35m ---- build ${GIT_PR_ID} paddlenlp \033[0m" build_pr_path=${nlp_dir} nlp_build ${build_pr_path} - cd $build_pr_path/dist - cp $build_pr_path/dist/p****.whl ${PPNLP_HOME}/upload/paddlenlp-${GIT_PR_ID}-py3-none-any.whl elif [ $1 == "pipelines" ];then echo -e "\033[35m ---- build latest pipelines \033[0m" python -m pip install --force-reinstall paddlenlp @@ -220,8 +221,7 @@ if [[ ${#P0case_list[*]} -ne 0 ]] || [[ ${#APIcase_list[*]} -ne 0 ]];then if [ ! -f ./dist/p****.whl ];then install_paddle echo "install_nlp_develop" - # python -m pip install paddlenlp -f https://www.paddlepaddle.org.cn/whl/paddlenlp.html - wget https://paddlenlp.bj.bcebos.com/wheels/paddlenlp-latest-py3-none-any.whl + wget https://paddlenlp.bj.bcebos.com/wheels/paddlenlp-ci-py3-none-any.whl python -m pip install paddlenlp-latest-py3-none-any.whl else echo "instal_nlp_pr" From 1dbbed1fc5567b82c03d07facdffaf3ae033556b Mon Sep 17 00:00:00 2001 From: zjjlivein <1834792141@qq.com> Date: Thu, 2 Feb 2023 10:39:45 +0800 Subject: [PATCH 2/3] fix latest whl --- scripts/regression/run_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/regression/run_ci.sh b/scripts/regression/run_ci.sh index bc202c59eaec..a22f9cc3b6ac 100644 --- a/scripts/regression/run_ci.sh +++ b/scripts/regression/run_ci.sh @@ -222,7 +222,7 @@ if [[ ${#P0case_list[*]} -ne 0 ]] || [[ ${#APIcase_list[*]} -ne 0 ]];then install_paddle echo "install_nlp_develop" wget https://paddlenlp.bj.bcebos.com/wheels/paddlenlp-ci-py3-none-any.whl - python -m pip install paddlenlp-latest-py3-none-any.whl + python -m pip install paddlenlp-ci-py3-none-any.whl else echo "instal_nlp_pr" python -m pip install dist/p****.whl From e49b1d1a7a7160b19c79772a8c70a8ae2d749a20 Mon Sep 17 00:00:00 2001 From: zjjlivein <1834792141@qq.com> Date: Thu, 2 Feb 2023 20:40:57 +0800 Subject: [PATCH 3/3] uninstall cpu paddle --- scripts/regression/run_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/regression/run_ci.sh b/scripts/regression/run_ci.sh index a22f9cc3b6ac..e0d16d3489c1 100644 --- a/scripts/regression/run_ci.sh +++ b/scripts/regression/run_ci.sh @@ -69,8 +69,8 @@ echo "python="${python} # Insatll paddlepaddle-gpu install_paddle(){ echo -e "\033[35m ---- Install paddlepaddle-gpu \033[0m" - python -m pip install --ignore-installed --upgrade pip python -m pip install -r scripts/regression/requirements_ci.txt + python -m pip uninstall paddlepaddle -y python -m pip install ${paddle}; python -c "import paddle; print('paddle version:',paddle.__version__,'\npaddle commit:',paddle.version.commit)"; python -c 'from visualdl import LogWriter'