未验证 提交 52057484 编写于 作者: T Thunderbrook 提交者: GitHub

fix eigen in push sparse; fix hadoop command (#26872)

* fix eigen in push sparse; fix hadoop command
test=develop

* add log in load_combine_op
test=develop
上级 f9d39b49
...@@ -95,9 +95,10 @@ void DatasetImpl<T>::SetHdfsConfig(const std::string& fs_name, ...@@ -95,9 +95,10 @@ void DatasetImpl<T>::SetHdfsConfig(const std::string& fs_name,
const std::string& fs_ugi) { const std::string& fs_ugi) {
fs_name_ = fs_name; fs_name_ = fs_name;
fs_ugi_ = fs_ugi; fs_ugi_ = fs_ugi;
std::string cmd = std::string("hadoop fs"); std::string cmd = std::string("$HADOOP_HOME/bin/hadoop fs");
cmd += " -D fs.default.name=" + fs_name; cmd += " -D fs.default.name=" + fs_name;
cmd += " -D hadoop.job.ugi=" + fs_ugi; cmd += " -D hadoop.job.ugi=" + fs_ugi;
cmd += " -Ddfs.client.block.write.retries=15 -Ddfs.rpc.timeout=500000";
paddle::framework::hdfs_set_command(cmd); paddle::framework::hdfs_set_command(cmd);
} }
......
...@@ -857,7 +857,7 @@ void FleetWrapper::PushSparseVarsWithLabelAsync( ...@@ -857,7 +857,7 @@ void FleetWrapper::PushSparseVarsWithLabelAsync(
float* g = g_tensor->data<float>(); float* g = g_tensor->data<float>();
if (scale_sparse_gradient_with_batch_size_ && grad_dim > 0) { if (scale_sparse_gradient_with_batch_size_ && grad_dim > 0) {
int dim = emb_dim + offset; int dim = emb_dim;
Eigen::Map< Eigen::Map<
Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>> Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>>
g_mat(g, g_tensor->numel() / dim, dim); g_mat(g, g_tensor->numel() / dim, dim);
......
...@@ -70,6 +70,7 @@ class LoadCombineOpKernel : public framework::OpKernel<T> { ...@@ -70,6 +70,7 @@ class LoadCombineOpKernel : public framework::OpKernel<T> {
auto out_vars = context.MultiOutputVar("Out"); auto out_vars = context.MultiOutputVar("Out");
for (size_t i = 0; i < out_var_names.size(); i++) { for (size_t i = 0; i < out_var_names.size(); i++) {
VLOG(4) << "loading tensor: " << out_var_names[i];
PADDLE_ENFORCE_NOT_NULL( PADDLE_ENFORCE_NOT_NULL(
out_vars[i], platform::errors::InvalidArgument( out_vars[i], platform::errors::InvalidArgument(
"The variable %s to be loaded cannot be found.", "The variable %s to be loaded cannot be found.",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册