未验证 提交 df64a966 编写于 作者: H hutuxian 提交者: GitHub

support set_test_mode and set comlog level(#23905)

上级 2d01cc85
...@@ -118,6 +118,10 @@ void BoxWrapper::BeginPass() const { ...@@ -118,6 +118,10 @@ void BoxWrapper::BeginPass() const {
"BeginPass failed in BoxPS.")); "BeginPass failed in BoxPS."));
} }
void BoxWrapper::SetTestMode(bool is_test) const {
boxps_ptr_->SetTestMode(is_test);
}
void BoxWrapper::EndPass(bool need_save_delta) const { void BoxWrapper::EndPass(bool need_save_delta) const {
int ret = boxps_ptr_->EndPass(need_save_delta); int ret = boxps_ptr_->EndPass(need_save_delta);
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
......
...@@ -44,6 +44,8 @@ limitations under the License. */ ...@@ -44,6 +44,8 @@ limitations under the License. */
#include "paddle/fluid/string/string_helper.h" #include "paddle/fluid/string/string_helper.h"
#define BUF_SIZE 1024 * 1024 #define BUF_SIZE 1024 * 1024
extern void comlog_set_log_level(int log_level);
extern int com_logstatus();
namespace paddle { namespace paddle {
namespace framework { namespace framework {
...@@ -167,9 +169,11 @@ class AfsManager { ...@@ -167,9 +169,11 @@ class AfsManager {
_afshandler = new afs::AfsFileSystem(fs_name.c_str(), user.c_str(), _afshandler = new afs::AfsFileSystem(fs_name.c_str(), user.c_str(),
pwd.c_str(), conf_path.c_str()); pwd.c_str(), conf_path.c_str());
VLOG(0) << "AFSAPI Init: user: " << user << ", pwd: " << pwd; VLOG(0) << "AFSAPI Init: user: " << user << ", pwd: " << pwd;
int ret = _afshandler->Init(true, true); int ret = _afshandler->Init(true, (com_logstatus() == 0));
PADDLE_ENFORCE_EQ(ret, 0, platform::errors::PreconditionNotMet( PADDLE_ENFORCE_EQ(ret, 0, platform::errors::PreconditionNotMet(
"Called AFSAPI Init Interface Failed.")); "Called AFSAPI Init Interface Failed."));
// Too high level will hurt the performance
comlog_set_log_level(4);
ret = _afshandler->Connect(); ret = _afshandler->Connect();
PADDLE_ENFORCE_EQ(ret, 0, platform::errors::PreconditionNotMet( PADDLE_ENFORCE_EQ(ret, 0, platform::errors::PreconditionNotMet(
"Called AFSAPI Connect Interface Failed")); "Called AFSAPI Connect Interface Failed"));
...@@ -334,6 +338,7 @@ class BoxWrapper { ...@@ -334,6 +338,7 @@ class BoxWrapper {
void EndFeedPass(boxps::PSAgentBase* agent) const; void EndFeedPass(boxps::PSAgentBase* agent) const;
void BeginPass() const; void BeginPass() const;
void EndPass(bool need_save_delta) const; void EndPass(bool need_save_delta) const;
void SetTestMode(bool is_test) const;
void PullSparse(const paddle::platform::Place& place, void PullSparse(const paddle::platform::Place& place,
const std::vector<const uint64_t*>& keys, const std::vector<const uint64_t*>& keys,
const std::vector<float*>& values, const std::vector<float*>& values,
......
...@@ -69,6 +69,8 @@ void BindBoxWrapper(py::module* m) { ...@@ -69,6 +69,8 @@ void BindBoxWrapper(py::module* m) {
py::call_guard<py::gil_scoped_release>()) py::call_guard<py::gil_scoped_release>())
.def("feed_pass", &framework::BoxWrapper::FeedPass, .def("feed_pass", &framework::BoxWrapper::FeedPass,
py::call_guard<py::gil_scoped_release>()) py::call_guard<py::gil_scoped_release>())
.def("set_test_mode", &framework::BoxWrapper::SetTestMode,
py::call_guard<py::gil_scoped_release>())
.def("save_delta", &framework::BoxWrapper::SaveDelta, .def("save_delta", &framework::BoxWrapper::SaveDelta,
py::call_guard<py::gil_scoped_release>()) py::call_guard<py::gil_scoped_release>())
.def("initialize_gpu", &framework::BoxWrapper::InitializeGPU, .def("initialize_gpu", &framework::BoxWrapper::InitializeGPU,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册