From a1b6ae26ca9744e3dded7488d9a2b213c85787d7 Mon Sep 17 00:00:00 2001 From: Sing_chan <51314274+betterpig@users.noreply.github.com> Date: Sat, 18 Sep 2021 17:20:08 +0800 Subject: [PATCH] make whl-build task only reuse local third_party cache (#35858) --- paddle/scripts/paddle_build.bat | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 1cc4927e73..91ba54959a 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -76,6 +76,7 @@ if not defined NIGHTLY_MODE set PRECISION_TEST=OFF if not defined retry_times set retry_times=3 if not defined PYTHON_ROOT set PYTHON_ROOT=C:\Python37 if not defined BUILD_DIR set BUILD_DIR=build +set task_name=%1 rem ------initialize the python environment------ set PYTHON_EXECUTABLE=%PYTHON_ROOT%\python.exe @@ -363,14 +364,22 @@ echo echo ${md5_content}^>md5.txt >> cache.sh %cache_dir%\tools\busybox64.exe bash cache.sh set /p md5=< md5.txt +echo %task_name%|findstr build >nul && ( + set THIRD_PARTY_HOME=%cache_dir:\=/%/third_party + set THIRD_PARTY_PATH=!THIRD_PARTY_HOME!/%md5% + echo %task_name% is a whl-build task, will only reuse local third_party cache. + goto :cmake_impl +) || ( + echo %task_name% is a PR-CI-Windows task, will try to reuse bos and local third_party cache both. +) + if "%WITH_GPU%"=="ON" ( - for /F "delims=" %%# in ('nvcc --version^|findstr V1') do set cuda_version=%%# - set cuda_version=!cuda_version:~-7,4! + for /F %%# in ('dir /b /d "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\"') do set cuda_version=%%# + set cuda_version=!cuda_version:~-4! set sub_dir=cuda!cuda_version:.=! ) else ( set sub_dir=cpu ) - set THIRD_PARTY_HOME=%cache_dir:\=/%/third_party/%sub_dir% set THIRD_PARTY_PATH=%THIRD_PARTY_HOME%/%md5% set UPLOAD_TP_FILE=OFF @@ -397,7 +406,7 @@ if not exist %THIRD_PARTY_PATH% ( if not exist %THIRD_PARTY_PATH% ( set UPLOAD_TP_FILE=ON ) cd %work_dir%\%BUILD_DIR% ) else ( - echo Found reusable third_party cache locally, will reuse it. + echo Found reusable third_party cache in %THIRD_PARTY_PATH%, will reuse it. ) :cmake_impl -- GitLab