Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
3ed53280
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
3ed53280
编写于
7月 20, 2022
作者:
T
tianshuo78520a
提交者:
GitHub
7月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean CI_SKIP_CPP_TEST (#44412)
上级
7daae985
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
10 addition
and
66 deletion
+10
-66
cmake/generic.cmake
cmake/generic.cmake
+6
-24
paddle/fluid/framework/new_executor/CMakeLists.txt
paddle/fluid/framework/new_executor/CMakeLists.txt
+1
-2
paddle/fluid/inference/tests/api/CMakeLists.txt
paddle/fluid/inference/tests/api/CMakeLists.txt
+1
-6
paddle/fluid/jit/CMakeLists.txt
paddle/fluid/jit/CMakeLists.txt
+1
-3
paddle/fluid/memory/CMakeLists.txt
paddle/fluid/memory/CMakeLists.txt
+1
-3
paddle/scripts/infrt_build.sh
paddle/scripts/infrt_build.sh
+0
-11
paddle/scripts/paddle_build.bat
paddle/scripts/paddle_build.bat
+0
-3
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+0
-12
tools/check_added_ut.sh
tools/check_added_ut.sh
+0
-2
未找到文件。
cmake/generic.cmake
浏览文件 @
3ed53280
...
...
@@ -443,7 +443,7 @@ function(cc_binary TARGET_NAME)
endfunction
()
function
(
cc_test_build TARGET_NAME
)
if
(
WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
@@ -484,7 +484,7 @@ function(cc_test_build TARGET_NAME)
endfunction
()
function
(
cc_test_run TARGET_NAME
)
if
(
WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs COMMAND ARGS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
@@ -513,10 +513,7 @@ function(cc_test_run TARGET_NAME)
endfunction
()
function
(
cc_test TARGET_NAME
)
# The environment variable `CI_SKIP_CPP_TEST` is used to skip the compilation
# and execution of test in CI. `CI_SKIP_CPP_TEST` is set to ON when no files
# other than *.py are modified.
if
(
WITH_TESTING AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS ARGS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
@@ -617,12 +614,7 @@ function(nv_binary TARGET_NAME)
endfunction
()
function
(
nv_test TARGET_NAME
)
# The environment variable `CI_SKIP_CPP_TEST` is used to skip the compilation
# and execution of test in CI. `CI_SKIP_CPP_TEST` is set to ON when no files
# other than *.py are modified.
if
(
WITH_GPU
AND WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_GPU AND WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
@@ -736,12 +728,7 @@ function(hip_binary TARGET_NAME)
endfunction
()
function
(
hip_test TARGET_NAME
)
# The environment variable `CI_SKIP_CPP_TEST` is used to skip the compilation
# and execution of test in CI. `CI_SKIP_CPP_TEST` is set to ON when no files
# other than *.py are modified.
if
(
WITH_ROCM
AND WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_ROCM AND WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
hip_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
@@ -850,12 +837,7 @@ function(xpu_binary TARGET_NAME)
endfunction
()
function
(
xpu_test TARGET_NAME
)
# The environment variable `CI_SKIP_CPP_TEST` is used to skip the compilation
# and execution of test in CI. `CI_SKIP_CPP_TEST` is set to ON when no files
# other than *.py are modified.
if
(
WITH_XPU_KP
AND WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_XPU_KP AND WITH_TESTING
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
xpu_test
"
${
options
}
"
"
${
oneValueArgs
}
"
...
...
paddle/fluid/framework/new_executor/CMakeLists.txt
浏览文件 @
3ed53280
...
...
@@ -62,8 +62,7 @@ cc_library(
# skip win32 since wget is not installed by default on windows machine.
if
(
WITH_GPU
AND WITH_TESTING
AND NOT WIN32
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
AND NOT WIN32
)
add_custom_target
(
download_program
COMMAND wget -nc https://paddle-ci.gz.bcebos.com/new_exec/lm_main_program
...
...
paddle/fluid/inference/tests/api/CMakeLists.txt
浏览文件 @
3ed53280
# If CI_SKIP_CPP_TEST=ON, there is no need to build and run these test.
if
(
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
return
()
endif
()
# In Windows, c_api test link must link both 2 shared to avoid symbols redefinition,
# in Linux, c_api test cant do like this or graph_to_program register more than once.
# Both Windows and Linux can only use paddle_inference_c, but this will increase size
...
...
@@ -329,7 +324,7 @@ if(NOT APPLE AND WITH_MKLML)
inference_analysis_api_test
(
test_analyzer_seq_pool1_profile
${
SEQ_POOL1_INSTALL_DIR
}
analyzer_seq_pool1_profile_tester.cc
)
if
(
NOT WIN32
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
NOT WIN32
)
set_tests_properties
(
test_analyzer_seq_pool1_compare_determine
PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_analyzer_seq_pool1 PROPERTIES TIMEOUT 120
)
...
...
paddle/fluid/jit/CMakeLists.txt
浏览文件 @
3ed53280
...
...
@@ -29,9 +29,7 @@ cc_library(
DEPS jit_serializer jit_function_utils jit_serializer_utils
jit_compilation_unit jit_function_schema
)
if
(
WITH_TESTING
AND NOT WIN32
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_TESTING AND NOT WIN32
)
add_custom_target
(
jit_download_program
COMMAND wget -nc -q
...
...
paddle/fluid/memory/CMakeLists.txt
浏览文件 @
3ed53280
...
...
@@ -71,9 +71,7 @@ if(WITH_TESTING AND TEST cuda_managed_memory_test)
TIMEOUT 50
)
endif
()
if
(
WITH_GPU
AND WITH_TESTING
AND NOT
"$ENV{CI_SKIP_CPP_TEST}"
STREQUAL
"ON"
)
if
(
WITH_GPU AND WITH_TESTING
)
nv_test
(
get_base_ptr_test
SRCS get_base_ptr_test.cu
...
...
paddle/scripts/infrt_build.sh
浏览文件 @
3ed53280
...
...
@@ -62,17 +62,6 @@ function init() {
# NOTE(chenweihang): For easy debugging, CI displays the C++ error stacktrace by default
export
FLAGS_call_stack_level
=
2
# set CI_SKIP_CPP_TEST if only *.py changed
# In order to avoid using in some CI(such as daily performance), the current
# branch must not be `${BRANCH}` which is usually develop.
if
[
${
CI_SKIP_CPP_TEST
:-
ON
}
==
"OFF"
]
;
then
echo
"CI_SKIP_CPP_TEST=OFF"
else
if
[
"
$(
git branch |
grep
"^
\*
"
|
awk
'{print $2}'
)
"
!=
"
${
BRANCH
}
"
]
;
then
git diff
--name-only
${
BRANCH
}
|
grep
-v
"
\.
py$"
||
export
CI_SKIP_CPP_TEST
=
ON
fi
fi
}
function
infrt_gen_and_build
()
{
...
...
paddle/scripts/paddle_build.bat
浏览文件 @
3ed53280
...
...
@@ -659,9 +659,6 @@ echo ========================================
echo
Step
4
.
Running
unit
tests
...
echo
========================================
:
set
CI_SKIP_CPP_TEST
if
only
*
.py
changed
git
diff
--name-only
%BRANCH%
|
findstr
/V
"\.py"
||
set
CI_SKIP_CPP_TEST
=
ON
pip
install
-r
%work_dir%
\python\unittest_py\requirements.txt
if
%ERRORLEVEL%
NEQ
0
(
echo
pip
install
unittest
requirements
.txt
failed
!
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
3ed53280
...
...
@@ -60,17 +60,6 @@ function init() {
# NOTE(chenweihang): For easy debugging, CI displays the C++ error stacktrace by default
export
FLAGS_call_stack_level
=
2
# set CI_SKIP_CPP_TEST if only *.py changed
# In order to avoid using in some CI(such as daily performance), the current
# branch must not be `${BRANCH}` which is usually develop.
if
[
${
CI_SKIP_CPP_TEST
:-
ON
}
==
"OFF"
]
;
then
echo
"CI_SKIP_CPP_TEST=OFF"
else
if
[
"
$(
git branch |
grep
"^
\*
"
|
awk
'{print $2}'
)
"
!=
"
${
BRANCH
}
"
]
;
then
git diff
--name-only
${
BRANCH
}
|
grep
-v
"
\.
py$"
||
export
CI_SKIP_CPP_TEST
=
ON
fi
fi
}
function
cmake_base
()
{
...
...
@@ -3232,7 +3221,6 @@ function reuse_so_cache() {
down_proto_so
=
`
echo
$?
`
set
-e
if
[
"
${
down_proto_so
}
"
-eq
0
]
;
then
export
CI_SKIP_CPP_TEST
=
ON
cd
build
&&
mv
../proto_so.tar.gz
.
tar
--use-compress-program
=
pigz
-xpf
proto_so.tar.gz
cmake_gen
${
PYTHON_ABI
:-
""
}
${
parallel_number
}
...
...
tools/check_added_ut.sh
浏览文件 @
3ed53280
...
...
@@ -21,7 +21,6 @@ if [ -z ${BRANCH} ]; then
BRANCH
=
"develop"
fi
export
CI_SKIP_CPP_TEST
=
OFF
if
[[
"
$SYSTEM
"
==
"Linux"
]]
||
[[
"
$SYSTEM
"
==
"Darwin"
]]
;
then
PADDLE_ROOT
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
/../"
&&
pwd
)
"
elif
[[
"
$SYSTEM
"
==
"Windows_NT"
]]
;
then
...
...
@@ -75,4 +74,3 @@ git checkout -f $CURBRANCH
echo
$CURBRANCH
git branch
-D
prec_added_ut
cd
$CURDIR
export
CI_SKIP_CPP_TEST
=
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录