未验证 提交 8b97bb2e 编写于 作者: W Wilber 提交者: GitHub

Update cmake for arm ft and fix a bug for Predictor dtor. (#28586)

上级 f962bd34
...@@ -175,9 +175,15 @@ bool AnalysisPredictor::PrepareScope( ...@@ -175,9 +175,15 @@ bool AnalysisPredictor::PrepareScope(
status_is_cloned_ = true; status_is_cloned_ = true;
} else { } else {
paddle::framework::InitDevices(false); paddle::framework::InitDevices(false);
scope_.reset(new paddle::framework::Scope(), [&](framework::Scope *scope) { scope_.reset(new paddle::framework::Scope(), [](framework::Scope *scope) {
delete scope; delete scope;
memory::Release(place_); #ifdef PADDLE_WITH_CUDA
for (int dev_id = 0; dev_id < paddle::platform::GetCUDADeviceCount();
++dev_id) {
memory::Release(platform::CUDAPlace(dev_id));
}
#endif
memory::Release(platform::CPUPlace());
}); });
status_is_cloned_ = false; status_is_cloned_ = false;
} }
......
...@@ -106,7 +106,7 @@ if(APPLE) ...@@ -106,7 +106,7 @@ if(APPLE)
message(FATAL_ERROR "install_name_tool not found, please check.\n") message(FATAL_ERROR "install_name_tool not found, please check.\n")
endif() endif()
endif() endif()
if(LINUX AND NOT WITH_SW) if(LINUX AND NOT WITH_SW AND NOT WITH_ARM)
find_program(PATCHELF_EXECUTABLE patchelf) find_program(PATCHELF_EXECUTABLE patchelf)
if(NOT PATCHELF_EXECUTABLE) if(NOT PATCHELF_EXECUTABLE)
message(FATAL_ERROR "patchelf not found, please install it.\n" message(FATAL_ERROR "patchelf not found, please install it.\n"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册