Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
6ce71648
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6ce71648
编写于
9月 26, 2021
作者:
L
Leo Chen
提交者:
GitHub
9月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "auto read all public envs from flags_map in paddle_gtest_main (#36057)"
This reverts commit
3fabc808
.
上级
2fe9ae71
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
45 addition
and
8 deletion
+45
-8
paddle/testing/paddle_gtest_main.cc
paddle/testing/paddle_gtest_main.cc
+45
-8
未找到文件。
paddle/testing/paddle_gtest_main.cc
浏览文件 @
6ce71648
...
...
@@ -15,7 +15,6 @@ limitations under the License. */
#include "gflags/gflags.h"
#include "gtest/gtest.h"
#include "paddle/fluid/memory/allocation/allocator_strategy.h"
#include "paddle/fluid/platform/flags.h"
#include "paddle/fluid/platform/init.h"
#include "paddle/fluid/platform/npu_info.h"
...
...
@@ -23,11 +22,13 @@ int main(int argc, char** argv) {
paddle
::
memory
::
allocation
::
UseAllocatorStrategyGFlag
();
testing
::
InitGoogleTest
(
&
argc
,
argv
);
std
::
vector
<
char
*>
new_argv
;
std
::
string
gflags_env
;
for
(
int
i
=
0
;
i
<
argc
;
++
i
)
{
new_argv
.
push_back
(
argv
[
i
]);
}
std
::
vector
<
std
::
string
>
envs
;
std
::
vector
<
std
::
string
>
undefok
;
#if defined(PADDLE_WITH_DISTRIBUTE) && !defined(PADDLE_WITH_PSLIB)
std
::
string
str_max_body_size
;
if
(
::
GFLAGS_NAMESPACE
::
GetCommandLineOption
(
"max_body_size"
,
...
...
@@ -37,13 +38,35 @@ int main(int argc, char** argv) {
}
#endif
const
auto
&
flag_map
=
paddle
::
platform
::
GetExportedFlagInfoMap
();
for
(
const
auto
&
pair
:
flag_map
)
{
const
std
::
string
&
name
=
pair
.
second
.
name
;
if
(
pair
.
second
.
is_writable
)
{
// means public
envs
.
push_back
(
name
);
}
}
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) || \
defined(PADDLE_WITH_ASCEND_CL)
envs
.
push_back
(
"fraction_of_gpu_memory_to_use"
);
envs
.
push_back
(
"initial_gpu_memory_in_mb"
);
envs
.
push_back
(
"reallocate_gpu_memory_in_mb"
);
envs
.
push_back
(
"allocator_strategy"
);
envs
.
push_back
(
"selected_gpus"
);
#elif __clang__
envs
.
push_back
(
"use_mkldnn"
);
envs
.
push_back
(
"initial_cpu_memory_in_mb"
);
envs
.
push_back
(
"allocator_strategy"
);
undefok
.
push_back
(
"use_mkldnn"
);
undefok
.
push_back
(
"initial_cpu_memory_in_mb"
);
#else
envs
.
push_back
(
"use_pinned_memory"
);
envs
.
push_back
(
"use_mkldnn"
);
envs
.
push_back
(
"initial_cpu_memory_in_mb"
);
envs
.
push_back
(
"allocator_strategy"
);
undefok
.
push_back
(
"use_pinned_memory"
);
undefok
.
push_back
(
"use_mkldnn"
);
undefok
.
push_back
(
"initial_cpu_memory_in_mb"
);
#endif
#if defined(PADDLE_WITH_ASCEND_CL)
envs
.
push_back
(
"selected_npus"
);
envs
.
push_back
(
"npu_config_path"
);
#endif
char
*
env_str
=
nullptr
;
if
(
envs
.
size
()
>
0
)
{
...
...
@@ -57,6 +80,18 @@ int main(int argc, char** argv) {
VLOG
(
1
)
<<
"gtest env_string:"
<<
env_string
;
}
char
*
undefok_str
=
nullptr
;
if
(
undefok
.
size
()
>
0
)
{
std
::
string
undefok_string
=
"--undefok="
;
for
(
auto
t
:
undefok
)
{
undefok_string
+=
t
+
","
;
}
undefok_string
=
undefok_string
.
substr
(
0
,
undefok_string
.
length
()
-
1
);
undefok_str
=
strdup
(
undefok_string
.
c_str
());
new_argv
.
push_back
(
undefok_str
);
VLOG
(
1
)
<<
"gtest undefok_string:"
<<
undefok_string
;
}
int
new_argc
=
static_cast
<
int
>
(
new_argv
.
size
());
char
**
new_argv_address
=
new_argv
.
data
();
::
GFLAGS_NAMESPACE
::
ParseCommandLineFlags
(
...
...
@@ -70,5 +105,7 @@ int main(int argc, char** argv) {
#endif
if
(
env_str
)
free
(
env_str
);
if
(
undefok_str
)
free
(
undefok_str
);
return
ret
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录