From 28554c3f85adbd39e55cf0fcb3c4c974ebc91891 Mon Sep 17 00:00:00 2001 From: Zhou Wei <52485244+zhouwei25@users.noreply.github.com> Date: Mon, 24 Aug 2020 01:39:47 +0800 Subject: [PATCH] add --user for pip (#26440) --- paddle/scripts/paddle_build.bat | 73 +++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index d3f3fc79c4..2992cbb852 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -28,21 +28,24 @@ rem ------initialize the virtual environment------ if not defined PYTHON_ROOT set PYTHON_ROOT=C:\Python37 set PATH=%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH% -set PYTHON_EXECUTABLE=%PYTHON_ROOT%\python.exe -%PYTHON_EXECUTABLE% -m pip install virtualenv -%PYTHON_EXECUTABLE% -m virtualenv paddle_winci -call paddle_winci\Scripts\activate.bat +rem ToDo: virtual environment can't be deleted safely, some process not exit when task is canceled +rem Now use system python environment temporarily +rem set PYTHON_EXECUTABLE=%PYTHON_ROOT%\python.exe +rem %PYTHON_EXECUTABLE% -m pip install virtualenv +rem %PYTHON_EXECUTABLE% -m virtualenv paddle_winci +rem call paddle_winci\Scripts\activate.bat rem ------pre install requirement---------- where python where pip -pip install --upgrade pip -pip install wheel -pip install gym -pip install -U -r %work_dir%\python\requirements.txt +pip install --upgrade pip --user +pip install wheel --user +pip install gym --user +pip install -U -r %work_dir%\python\requirements.txt --user if %ERRORLEVEL% NEQ 0 ( - call paddle_winci\Scripts\deactivate.bat - exit /b %ERRORLEVEL% + call paddle_winci\Scripts\deactivate.bat 2>NUL + echo pip install requirements.txt failed! + exit /b 7 ) rem ------initialize common variable------ @@ -127,9 +130,9 @@ cmake .. -G "Visual Studio 14 2015 Win64" -DWITH_AVX=%WITH_AVX% -DWITH_GPU=%WITH goto:eof :cmake_error -call paddle_winci\Scripts\deactivate.bat +call paddle_winci\Scripts\deactivate.bat 2>NUL echo Cmake failed, will exit! -exit /b 1 +exit /b 7 rem --------------------------------------------------------------------------------------------- :build @@ -140,12 +143,12 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd6 set build_times=1 :build_tp -echo Build third_party the %build_times% time: -msbuild /m /p:Configuration=Release /verbosity:quiet third_party.vcxproj +echo Build third_party for %build_times% time: +msbuild /m /p:Configuration=Release /verbosity:minimal third_party.vcxproj if %ERRORLEVEL% NEQ 0 ( set /a build_times=%build_times%+1 if %build_times% GTR 3 ( - exit /b 1 + exit /b 7 ) else ( echo Build third_party failed, will retry! goto :build_tp @@ -155,12 +158,12 @@ echo Build third_party successfully! set build_times=1 :build_paddle -echo Build Paddle the %build_times% time: -msbuild /m /p:Configuration=Release /verbosity:minimal paddle.sln +echo Build Paddle for %build_times% time: +msbuild /m /p:Configuration=Release /verbosity:quiet paddle.sln if %ERRORLEVEL% NEQ 0 ( set /a build_times=%build_times%+1 if %build_times% GTR 2 ( - exit /b 1 + exit /b 7 ) else ( echo Build Paddle failed, will retry! goto :build_paddle @@ -170,7 +173,7 @@ echo Build Paddle successfully! goto:eof :build_error -call paddle_winci\Scripts\deactivate.bat +call paddle_winci\Scripts\deactivate.bat 2>NUL echo Build Paddle failed, will exit! exit /b 7 @@ -182,16 +185,21 @@ echo ======================================== dir /s /b python\dist\*.whl > whl_file.txt set /p PADDLE_WHL_FILE_WIN=< whl_file.txt -pip install -U %PADDLE_WHL_FILE_WIN% -if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL% +pip uninstall -y paddlepaddle +pip uninstall -y paddlepaddle-gpu +pip install -U %PADDLE_WHL_FILE_WIN% --user +if %ERRORLEVEL% NEQ 0 ( + call paddle_winci\Scripts\deactivate.bat 2>NUL + echo pip install whl package failed! + exit /b 3 +) -echo import paddle.fluid;print(paddle.__version__) > test_whl.py -python test_whl.py +python %work_dir%\paddle\scripts\installation_validate.py goto:eof :test_whl_pacakage_error -call paddle_winci\Scripts\deactivate.bat -echo Pip install whl package failed, will exit! +call paddle_winci\Scripts\deactivate.bat 2>NUL +echo Test import paddle failed, will exit! exit /b 3 rem --------------------------------------------------------------------------------------------- @@ -208,11 +216,11 @@ dir %THIRD_PARTY_PATH:/=\%\install\mkldnn\bin dir %THIRD_PARTY_PATH:/=\%\install\warpctc\bin set PATH=%THIRD_PARTY_PATH:/=\%\install\openblas\lib;%THIRD_PARTY_PATH:/=\%\install\openblas\bin;%THIRD_PARTY_PATH:/=\%\install\zlib\bin;%THIRD_PARTY_PATH:/=\%\install\mklml\lib;%THIRD_PARTY_PATH:/=\%\install\mkldnn\bin;%THIRD_PARTY_PATH:/=\%\install\warpctc\bin;%PATH% -ctest.exe --output-on-failure -C Release -j 7 +ctest.exe --output-on-failure -C Release -j 8 goto:eof :unit_test_error -call paddle_winci\Scripts\deactivate.bat +call paddle_winci\Scripts\deactivate.bat 2>NUL echo Running unit tests failed, will exit! exit /b 8 @@ -228,7 +236,7 @@ cd %work_dir%\paddle\fluid\inference\api\demo_ci goto:eof :test_inference_error -call paddle_winci\Scripts\deactivate.bats +call paddle_winci\Scripts\deactivate.bat 2>NUL echo Testing fluid library for inference failed! exit /b 5 @@ -303,8 +311,8 @@ echo git checkout -f origin_pr >> check_change_of_unittest.sh goto:eof :check_change_of_unittest_error -call paddle_winci\Scripts\deactivate.bat -exit /b 6 +call paddle_winci\Scripts\deactivate.bat 2>NUL +exit /b 1 rem --------------------------------------------------------------------------------------------- @@ -322,7 +330,10 @@ taskkill /f /im git-remote-https.exe 2>NUL taskkill /f /im vctip.exe 2>NUL taskkill /f /im cvtres.exe 2>NUL taskkill /f /im rc.exe 2>NUL -call paddle_winci\Scripts\deactivate.bat +taskkill /f /im %cd%\paddle\fluid\pybind\Release\op_function_generator.exe 2>NUL +taskkill /f /im python.exe 2>NUL +call paddle_winci\Scripts\deactivate.bat 2>NUL +taskkill /f /im python.exe 2>NUL echo Windows CI run successfully! exit /b 0 -- GitLab