From 1eb927f9355b275819507da4b65358bed482470b Mon Sep 17 00:00:00 2001 From: Zhou Wei <52485244+zhouwei25@users.noreply.github.com> Date: Tue, 23 Mar 2021 22:23:01 +0800 Subject: [PATCH] Restore the third-party library cache for windows (#31811) --- CMakeLists.txt | 1 - paddle/scripts/paddle_build.bat | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 676c94591e..765d8fc157 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,6 @@ if(WITH_MUSL) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations -Wno-deprecated-declarations -Wno-error=pessimizing-move -Wno-error=deprecated-copy") endif() -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm1000 /fp:fast") if(WIN32) option(MSVC_STATIC_CRT "use static C Runtime library by default" ON) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index c5bb7ea472..2edb062ac8 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -30,10 +30,6 @@ taskkill /f /im op_function_generator.exe wmic process where name="op_function_generator.exe" call terminate taskkill /f /im python.exe 2>NUL -:: TODO: Temporarily,REMOVE after VS2017 is stable. -set WITH_TPCACHE=OFF -rmdir %cache_dir%\third_party_GPU /s/q -rmdir %cache_dir%\third_party /s/q rem ------initialize common variable------ if not defined GENERATOR set GENERATOR="Visual Studio 15 2017 Win64" @@ -85,7 +81,7 @@ git show-ref --verify --quiet refs/heads/last_pr if %ERRORLEVEL% EQU 0 ( git diff HEAD last_pr --stat --name-only git diff HEAD last_pr --stat --name-only | findstr "setup.py.in" - if %ERRORLEVEL% EQU 0 ( + if !ERRORLEVEL! EQU 0 ( rmdir build /s/q ) git branch -D last_pr -- GitLab