提交 06a7f741 编写于 作者: M mozga-intel 提交者: ceci3

The flag of mkldnn is enabled iff it is necessary

test=develop
上级 320b2798
...@@ -86,6 +86,14 @@ bool IsCompiledWithCUDA() { ...@@ -86,6 +86,14 @@ bool IsCompiledWithCUDA() {
#endif #endif
} }
bool IsCompiledWithMKLDNN() {
#ifndef PADDLE_WITH_MKLDNN
return false;
#else
return true;
#endif
}
bool IsCompiledWithBrpc() { bool IsCompiledWithBrpc() {
#ifndef PADDLE_WITH_DISTRIBUTE #ifndef PADDLE_WITH_DISTRIBUTE
return false; return false;
...@@ -873,6 +881,7 @@ All parameter, weight, gradient are variables in Paddle. ...@@ -873,6 +881,7 @@ All parameter, weight, gradient are variables in Paddle.
[](bool init_p2p) { framework::InitDevices(init_p2p); }); [](bool init_p2p) { framework::InitDevices(init_p2p); });
m.def("is_compiled_with_cuda", IsCompiledWithCUDA); m.def("is_compiled_with_cuda", IsCompiledWithCUDA);
m.def("is_compiled_with_mkldnn", IsCompiledWithMKLDNN);
m.def("is_compiled_with_brpc", IsCompiledWithBrpc); m.def("is_compiled_with_brpc", IsCompiledWithBrpc);
m.def("is_compiled_with_dist", IsCompiledWithDIST); m.def("is_compiled_with_dist", IsCompiledWithDIST);
#ifdef PADDLE_WITH_CUDA #ifdef PADDLE_WITH_CUDA
......
...@@ -125,14 +125,13 @@ def __bootstrap__(): ...@@ -125,14 +125,13 @@ def __bootstrap__():
os.environ['OMP_NUM_THREADS'] = str(num_threads) os.environ['OMP_NUM_THREADS'] = str(num_threads)
sysstr = platform.system() sysstr = platform.system()
read_env_flags = [ read_env_flags = [
'check_nan_inf', 'benchmark', 'eager_delete_scope', 'use_mkldnn', 'check_nan_inf', 'benchmark', 'eager_delete_scope', 'use_ngraph',
'use_ngraph', 'initial_cpu_memory_in_mb', 'init_allocated_mem', 'initial_cpu_memory_in_mb', 'init_allocated_mem', 'free_idle_memory',
'free_idle_memory', 'paddle_num_threads', "dist_threadpool_size", 'paddle_num_threads', "dist_threadpool_size", 'eager_delete_tensor_gb',
'eager_delete_tensor_gb', 'fast_eager_deletion_mode', 'fast_eager_deletion_mode', 'allocator_strategy',
'allocator_strategy', 'reader_queue_speed_test_mode', 'reader_queue_speed_test_mode', 'print_sub_graph_dir',
'print_sub_graph_dir', 'pe_profile_fname', 'warpctc_dir', 'pe_profile_fname', 'warpctc_dir', 'inner_op_parallelism',
'inner_op_parallelism', 'enable_parallel_graph', 'enable_parallel_graph', 'multiple_of_cupti_buffer_size'
'multiple_of_cupti_buffer_size'
] ]
if 'Darwin' not in sysstr: if 'Darwin' not in sysstr:
read_env_flags.append('use_pinned_memory') read_env_flags.append('use_pinned_memory')
...@@ -140,6 +139,9 @@ def __bootstrap__(): ...@@ -140,6 +139,9 @@ def __bootstrap__():
if os.name != 'nt': if os.name != 'nt':
read_env_flags.append('cpu_deterministic') read_env_flags.append('cpu_deterministic')
if core.is_compiled_with_mkldnn():
read_env_flags.append('use_mkldnn')
if core.is_compiled_with_dist(): if core.is_compiled_with_dist():
read_env_flags.append('rpc_deadline') read_env_flags.append('rpc_deadline')
read_env_flags.append('rpc_server_profile_path') read_env_flags.append('rpc_server_profile_path')
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册