Skip to content

Commit d7da07f

Browse files
authored
[CI][SOT] Remove package github installation in CI and update SOT trigger file list (#63848)
1 parent 766535e commit d7da07f

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

paddle/scripts/paddle_build.bat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ if not defined INFERENCE_DEMO_INSTALL_DIR set INFERENCE_DEMO_INSTALL_DIR=%cache_
8484
if not defined LOG_LEVEL set LOG_LEVEL=normal
8585
if not defined PRECISION_TEST set PRECISION_TEST=OFF
8686
if not defined WIN_UNITTEST_LEVEL set WIN_UNITTEST_LEVEL=2
87-
rem LEVEL 0: For unittests unrelated to CUDA/TRT or unittests without GPU memory, only run on
87+
rem LEVEL 0: For unittests unrelated to CUDA/TRT or unittests without GPU memory, only run on
8888
rem PR-CI-Windows-Infernece(CUDA 11.2), skip them on PR-CI-Windows(CUDA 12.0)
89-
rem LEVEL 1: For unittests unrelated to CUDA/TRT, only run on PR-CI-Windows-Infernece(CUDA 11.2),
89+
rem LEVEL 1: For unittests unrelated to CUDA/TRT, only run on PR-CI-Windows-Infernece(CUDA 11.2),
9090
rem skip them on PR-CI-Windows(CUDA 12.0)
91-
rem LEVEL 2: run all test
91+
rem LEVEL 2: run all test
9292
if not defined NIGHTLY_MODE set NIGHTLY_MODE=OFF
9393
if not defined retry_times set retry_times=1
9494
if not defined PYTHON_ROOT set PYTHON_ROOT=C:\Python38
@@ -376,15 +376,15 @@ if "%WITH_GPU%"=="ON" (
376376
if "!cuda_version!"=="12.0" (
377377
set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;%PATH%"
378378
)
379-
)
379+
)
380380
echo %PATH%
381381
rem CUDA_TOOLKIT_ROOT_DIR in cmake must use / rather than \
382382
set TENSORRT_ROOT=%TENSORRT_ROOT:\=/%
383383
set CUDA_TOOLKIT_ROOT_DIR=%CUDA_TOOLKIT_ROOT_DIR:\=/%
384384

385385
rem install ninja if GENERATOR is Ninja
386386
if %GENERATOR% == "Ninja" (
387-
rem Set the default generator for cmake to Ninja
387+
rem Set the default generator for cmake to Ninja
388388
setx CMAKE_GENERATOR Ninja
389389
pip install ninja
390390
if %errorlevel% NEQ 0 (
@@ -503,7 +503,6 @@ echo %task_name%|findstr build >nul && (
503503
:cmake_impl
504504
cd /d %work_dir%\%BUILD_DIR%
505505
rem whether to run cpp test
506-
python -m pip install github
507506
python -m pip install PyGithub
508507
python %work_dir%\tools\check_only_change_python_files.py
509508
if exist %work_dir%\%BUILD_DIR%\only_change_python_file.txt set WITH_CPP_TEST=OFF

paddle/scripts/paddle_build.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ EOF
289289
-DWITH_PYTHON=${WITH_PYTHON:-ON} \
290290
-DCUDNN_ROOT=/usr/ \
291291
-DWITH_TESTING=${WITH_TESTING:-ON} \
292-
-DWITH_CPP_TEST=${WITH_CPP_TEST:-ON} \
292+
-DWITH_CPP_TEST=${WITH_CPP_TEST:-ON} \
293293
-DWITH_COVERAGE=${WITH_COVERAGE:-OFF} \
294294
-DWITH_INCREMENTAL_COVERAGE=${WITH_INCREMENTAL_COVERAGE:-OFF} \
295295
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
@@ -958,9 +958,9 @@ function check_run_sot_ci() {
958958

959959
# git diff
960960
SOT_FILE_LIST=(
961-
paddle/fluid/operators/run_program_op.h
962-
paddle/fluid/operators/run_program_op.cu
963-
paddle/fluid/operators/run_program_op.cc
961+
paddle/pir
962+
paddle/phi
963+
paddle/scripts
964964
paddle/fluid/eager/to_static
965965
paddle/fluid/pybind/
966966
python/
@@ -3850,14 +3850,12 @@ function run_setup(){
38503850
INFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
38513851
fi
38523852

3853-
pip uninstall -y PyGithub
3854-
pip install github
3855-
pip install PyGithub
3853+
pip install -U PyGithub
38563854
python ${PADDLE_ROOT}/tools/check_only_change_python_files.py
38573855
if [ -f "${PADDLE_ROOT}/build/only_change_python_file.txt" ];then
3858-
export WITH_CPP_TEST=OFF
3856+
export WITH_CPP_TEST=OFF
38593857
else
3860-
export WITH_CPP_TEST=ON
3858+
export WITH_CPP_TEST=ON
38613859
fi
38623860
distibuted_flag=${WITH_DISTRIBUTE:-OFF}
38633861
gloo_flag=${distibuted_flag}

0 commit comments

Comments
 (0)