Skip to content

P
Paddle

BaiXuePrincess / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle
未验证 提交 2bafd338 编写于 作者: W Weilong Wu 提交者： GitHub
浏览文件
操作

[Move selected_rows PR #3] Change the relationship of [include/Cmake]. (#39128) 

* Added selected_rows and rw_lock to pten

* Renamed the unit test target to fix CI

* Removed Class SelectedRows in Fluid, changed include/cmake relationship, use pten::SelectedRows in Fluid

* Remove rw_lock.h,rw_lock_test.cc in fluid

* Use pten::RWLock and pten::AutoRDLock, fix CI

* Use pten::SelectedRows

* Use pten::SelectedRows

* Fix to pass NPU CI

* Use pten::SelectedRows, to pass NPU CI

* To fix NPU CI

* To fix NPU CI again
上级 3825b40f
显示空白变更内容
内联 并排
Showing with 685 addition and 1181 deletion
paddle/fluid/distributed/fleet.h
浏览文件 @ 2bafd338
......@@ -49,7 +49,7 @@ class PSCore;
using framework::LoDTensor;
using framework::Scope;
using framework::SelectedRows;
using pten::SelectedRows;
using framework::Variable;
using RpcCtxMap = std::unordered_map<std::string, CommContext>;
......
paddle/fluid/distributed/service/brpc_utils.cc
浏览文件 @ 2bafd338
......@@ -76,7 +76,7 @@ void SerializeToMultiVarMsgAndIOBuf(
if (var->IsType<framework::LoDTensor>()) {
SerializeLodTensor(var, ctx, send_var_msg, &temp_iobuf);
} else if (var->IsType<framework::SelectedRows>()) {
} else if (var->IsType<pten::SelectedRows>()) {
SerializeSelectedRows(var, ctx, send_var_msg, &temp_iobuf);
}
iobuf->append(temp_iobuf);
......@@ -127,7 +127,7 @@ void SerializeLodTensor(framework::Variable* var,
void SerializeSelectedRows(framework::Variable* var,
const platform::DeviceContext& ctx, VarMsg* var_msg,
butil::IOBuf* iobuf) {
framework::SelectedRows* slr = var->GetMutable<framework::SelectedRows>();
pten::SelectedRows* slr = var->GetMutable<pten::SelectedRows>();
auto* tensor = slr->mutable_value();
auto* rows = slr->mutable_rows();
......@@ -255,7 +255,7 @@ void DeserializeSelectedRows(
butil::IOBufBytesIterator& io_buffer_itr, // NOLINT
const platform::DeviceContext& ctx) {
const auto place = ctx.GetPlace();
auto* slr = var->GetMutable<framework::SelectedRows>();
auto* slr = var->GetMutable<pten::SelectedRows>();
framework::Tensor* tensor = slr->mutable_value();
slr->set_height(msg.slr_height());
std::vector<int64_t> tmp_rows(msg.dims()[0]);
......
paddle/fluid/distributed/service/communicator.cc
浏览文件 @ 2bafd338
......@@ -28,7 +28,7 @@ namespace paddle {
namespace distributed {
using framework::LoDTensor;
using framework::SelectedRows;
using pten::SelectedRows;
const uint32_t MAX_FEASIGN_NUM = 1024 * 100 * 100;
......@@ -293,7 +293,7 @@ void Communicator::RpcSendSparse(const std::string &var_name, int table_id,
std::vector<float *> push_g_vec;
auto *send_var = scope.FindVar(var_name);
auto *tensor = send_var->GetMutable<SelectedRows>();
auto *tensor = send_var->GetMutable<pten::SelectedRows>();
auto dim = tensor->value().dims()[1];
std::transform(tensor->rows().begin(), tensor->rows().end(),
std::back_inserter(sparse_push_keys),
......@@ -1012,10 +1012,10 @@ void GeoCommunicator::Send(const std::vector<std::string> &var_names,
auto *var = scope.FindVar(table_name);
PADDLE_ENFORCE_EQ(var->IsType<framework::SelectedRows>(), true,
PADDLE_ENFORCE_EQ(var->IsType<pten::SelectedRows>(), true,
platform::errors::InvalidArgument(
"Only need to send Sparse Grad in Geo mode."));
auto &rows = var->Get<framework::SelectedRows>().rows();
auto &rows = var->Get<pten::SelectedRows>().rows();
// insert ids which has not been record
for (size_t j = 0; j < rows.size(); j++) {
......@@ -1290,7 +1290,7 @@ void GeoCommunicator::SendSparse(const std::string &varname,
auto cpu_ctx = paddle::platform::CPUDeviceContext();
auto *var_delta = delta_scope_->Var(varname);
auto *t_delta = var_delta->GetMutable<framework::SelectedRows>();
auto *t_delta = var_delta->GetMutable<pten::SelectedRows>();
auto *var_t_value = t_delta->mutable_value();
var_t_value->Resize({static_cast<int64_t>(sparse_ids.size()), dims1});
auto *t_value = var_t_value->mutable_data<float>(cpu_ctx.GetPlace());
......
paddle/fluid/distributed/service/communicator.h
浏览文件 @ 2bafd338
......@@ -193,15 +193,15 @@ inline void MergeVars(const std::string &var_name,
result.device(*cpu_ctx.eigen_device()) =
result / static_cast<T>(vars.size());
}
} else if (var0->IsType<framework::SelectedRows>()) {
auto &slr0 = var0->Get<framework::SelectedRows>();
auto *out_slr = out_var->GetMutable<framework::SelectedRows>();
} else if (var0->IsType<pten::SelectedRows>()) {
auto &slr0 = var0->Get<pten::SelectedRows>();
auto *out_slr = out_var->GetMutable<pten::SelectedRows>();
out_slr->mutable_rows()->clear();
out_slr->mutable_value()->mutable_data<T>({{}}, cpu_place);
std::vector<const paddle::framework::SelectedRows *> inputs;
std::vector<const pten::SelectedRows *> inputs;
inputs.reserve(vars.size());
for (auto &var : vars) {
inputs.push_back(&var->Get<framework::SelectedRows>());
inputs.push_back(&var->Get<pten::SelectedRows>());
}
auto dev_ctx = paddle::platform::CPUDeviceContext();
if (merge_add) {
......
paddle/fluid/distributed/table/common_graph_table.h
浏览文件 @ 2bafd338
......@@ -39,8 +39,10 @@
#include "paddle/fluid/distributed/table/accessor.h"
#include "paddle/fluid/distributed/table/common_table.h"
#include "paddle/fluid/distributed/table/graph/graph_node.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/string/string_helper.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
namespace distributed {
class GraphShard {
......
paddle/fluid/distributed/table/common_sparse_table.h
浏览文件 @ 2bafd338
......@@ -29,8 +29,8 @@
#include "paddle/fluid/distributed/table/depends/initializers.h"
#include "paddle/fluid/distributed/table/depends/large_scale_kv.h"
#include "paddle/fluid/distributed/table/depends/sparse.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/string/string_helper.h"
#include "paddle/pten/core/utils/rw_lock.h"
#define PSERVER_SAVE_SUFFIX ".shard"
......@@ -110,7 +110,7 @@ struct Meta {
class CommonSparseTable : public SparseTable {
public:
CommonSparseTable() { rwlock_.reset(new framework::RWLock); }
CommonSparseTable() { rwlock_.reset(new pten::RWLock); }
virtual ~CommonSparseTable() {}
// unused method begin
......@@ -193,7 +193,7 @@ class CommonSparseTable : public SparseTable {
std::shared_ptr<SparseOptimizer> optimizer_;
std::vector<std::shared_ptr<ValueBlock>> shard_values_;
std::unordered_map<uint64_t, ReservoirValue<float>> pull_reservoir_;
std::unique_ptr<framework::RWLock> rwlock_{nullptr};
std::unique_ptr<pten::RWLock> rwlock_{nullptr};
};
} // namespace distributed
......
paddle/fluid/distributed/table/depends/large_scale_kv.h
浏览文件 @ 2bafd338
......@@ -32,7 +32,6 @@
#include "paddle/fluid/distributed/thirdparty/round_robin.h"
#include "paddle/fluid/framework/generator.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/selected_rows_utils.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/framework/threadpool.h"
......@@ -43,6 +42,7 @@
#include "paddle/fluid/string/printf.h"
#include "paddle/fluid/string/string_helper.h"
#include "paddle/pten/backends/dynload/port.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
namespace distributed {
......
paddle/fluid/distributed/table/sparse_geo_table.h
浏览文件 @ 2bafd338
......@@ -31,8 +31,8 @@
#include "paddle/fluid/distributed/table/depends/initializers.h"
#include "paddle/fluid/distributed/table/depends/large_scale_kv.h"
#include "paddle/fluid/distributed/table/depends/sparse.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/string/string_helper.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
namespace distributed {
......
paddle/fluid/distributed/test/brpc_utils_test.cc
浏览文件 @ 2bafd338
......@@ -56,7 +56,7 @@ void CreateVarsOnScope(framework::Scope* scope, platform::Place* place,
// var 3
framework::Variable* var3 = scope->Var("x3");
auto* slr = var3->GetMutable<framework::SelectedRows>();
auto* slr = var3->GetMutable<pten::SelectedRows>();
slr->set_height(564);
auto* tensor3 = slr->mutable_value();
auto* rows = slr->mutable_rows();
......@@ -111,7 +111,7 @@ void RunMultiVarMsg(platform::Place place) {
// check var3
framework::Variable* var3 = scope_recv.FindVar("x3");
auto* slr = var3->GetMutable<framework::SelectedRows>();
auto* slr = var3->GetMutable<pten::SelectedRows>();
EXPECT_EQ(slr->rows().size(), 564);
for (int i = 0; i < 564; ++i) {
EXPECT_EQ(slr->rows()[i], i);
......
paddle/fluid/eager/legacy/infer_shape_context.h
浏览文件 @ 2bafd338
......@@ -197,9 +197,8 @@ class EagerInferShapeContext : public paddle::framework::InferShapeContext {
out_var->GetMutable<paddle::framework::LoDTensor>();
out_lod_tensor->Resize(in_lod_tensor.dims());
} else {
auto& in_sele_rows = in_var->Get<paddle::framework::SelectedRows>();
auto out_sele_rows =
out_var->GetMutable<paddle::framework::SelectedRows>();
auto& in_sele_rows = in_var->Get<pten::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<pten::SelectedRows>();
out_sele_rows->mutable_value()->Resize(in_sele_rows.value().dims());
out_sele_rows->set_rows(in_sele_rows.rows());
out_sele_rows->set_height(in_sele_rows.height());
......@@ -368,8 +367,8 @@ class EagerInferShapeContext : public paddle::framework::InferShapeContext {
"Input variable should not be null"));
if (var->IsType<paddle::framework::LoDTensor>()) {
return var->Get<paddle::framework::LoDTensor>().dims();
} else if (var->IsType<paddle::framework::SelectedRows>()) {
return var->Get<paddle::framework::SelectedRows>().GetCompleteDims();
} else if (var->IsType<pten::SelectedRows>()) {
return var->Get<pten::SelectedRows>().GetCompleteDims();
} else {
PADDLE_THROW(paddle::platform::errors::PermissionDenied(
"Only LoDTensor/SelectedRows support 'GetDim', but Variables "
......@@ -385,8 +384,8 @@ class EagerInferShapeContext : public paddle::framework::InferShapeContext {
void SetDim(paddle::framework::Variable* var, const DDim& dim) {
if (var->IsType<paddle::framework::LoDTensor>()) {
var->GetMutable<paddle::framework::LoDTensor>()->Resize(dim);
} else if (var->IsType<paddle::framework::SelectedRows>()) {
var->GetMutable<paddle::framework::SelectedRows>()->set_height(dim[0]);
} else if (var->IsType<pten::SelectedRows>()) {
var->GetMutable<pten::SelectedRows>()->set_height(dim[0]);
} else {
PADDLE_THROW(paddle::platform::errors::PermissionDenied(
"Variable type_id %s, expect LoDTensor/SelectedRows."));
......
paddle/fluid/eager/legacy/prepared_operator.cc
浏览文件 @ 2bafd338
......@@ -32,8 +32,8 @@ const paddle::framework::Tensor* GetTensorFromVar(
const paddle::framework::Variable& var) {
if (var.IsType<paddle::framework::LoDTensor>()) {
return &(var.Get<paddle::framework::LoDTensor>());
} else if (var.IsType<paddle::framework::SelectedRows>()) {
return &(var.Get<paddle::framework::SelectedRows>().value());
} else if (var.IsType<pten::SelectedRows>()) {
return &(var.Get<pten::SelectedRows>().value());
} else {
return nullptr;
}
......
paddle/fluid/eager/legacy/tensor_helper.cc
浏览文件 @ 2bafd338
......@@ -32,7 +32,7 @@ void InitializeVariable(paddle::framework::Variable *var,
if (var_type == paddle::framework::proto::VarType::LOD_TENSOR) {
var->GetMutable<paddle::framework::LoDTensor>();
} else if (var_type == paddle::framework::proto::VarType::SELECTED_ROWS) {
var->GetMutable<paddle::framework::SelectedRows>();
var->GetMutable<pten::SelectedRows>();
} else if (var_type == paddle::framework::proto::VarType::FEED_MINIBATCH) {
var->GetMutable<paddle::framework::FeedList>();
} else if (var_type == paddle::framework::proto::VarType::FETCH_LIST) {
......@@ -72,9 +72,9 @@ void CopyVariable(const paddle::framework::Variable &src_var,
auto &src_tensor = src_var.Get<paddle::framework::LoDTensor>();
tmp_grad_tensor->set_lod(src_tensor.lod());
paddle::framework::TensorCopy(src_tensor, cpu_place, tmp_grad_tensor);
} else if (src_var.IsType<paddle::framework::SelectedRows>()) {
auto &src_slr = src_var.Get<paddle::framework::SelectedRows>();
auto *tmp_grad_slr = dst_var->GetMutable<paddle::framework::SelectedRows>();
} else if (src_var.IsType<pten::SelectedRows>()) {
auto &src_slr = src_var.Get<pten::SelectedRows>();
auto *tmp_grad_slr = dst_var->GetMutable<pten::SelectedRows>();
tmp_grad_slr->set_rows(src_slr.rows());
tmp_grad_slr->set_height(src_slr.height());
auto &src_t = src_slr.value();
......@@ -89,8 +89,8 @@ paddle::framework::proto::VarType::Type GetDtypeFromVar(
const paddle::framework::Variable &var) {
if (var.IsType<paddle::framework::LoDTensor>()) {
return var.Get<paddle::framework::LoDTensor>().type();
} else if (var.IsType<paddle::framework::SelectedRows>()) {
return var.Get<paddle::framework::SelectedRows>().value().type();
} else if (var.IsType<pten::SelectedRows>()) {
return var.Get<pten::SelectedRows>().value().type();
} else {
PADDLE_THROW(paddle::platform::errors::InvalidArgument(
"Variable type is %s, expect LoDTensor or SelectedRows.",
......@@ -101,8 +101,8 @@ const paddle::platform::Place &GetPlaceFromVar(
const paddle::framework::Variable &var) {
if (var.IsType<paddle::framework::LoDTensor>()) {
return var.Get<paddle::framework::LoDTensor>().place();
} else if (var.IsType<paddle::framework::SelectedRows>()) {
return var.Get<paddle::framework::SelectedRows>().place();
} else if (var.IsType<pten::SelectedRows>()) {
return var.Get<pten::SelectedRows>().place();
} else {
PADDLE_THROW(paddle::platform::errors::InvalidArgument(
"Variable type is %s, expect LoDTensor or SelectedRows.",
......
paddle/fluid/framework/CMakeLists.txt
浏览文件 @ 2bafd338
......@@ -383,7 +383,7 @@ cc_library(prune SRCS prune.cc DEPS framework_proto boost)
cc_test(prune_test SRCS prune_test.cc DEPS op_info prune recurrent_op device_context)
cc_test(var_type_inference_test SRCS var_type_inference_test.cc DEPS op_registry
proto_desc)
cc_library(selected_rows_utils SRCS selected_rows_utils.cc DEPS tensor)
cc_library(selected_rows_utils SRCS selected_rows_utils.cc DEPS selected_rows)
cc_test(selected_rows_utils_test SRCS selected_rows_utils_test.cc DEPS selected_rows_utils)
cc_test(op_kernel_type_test SRCS op_kernel_type_test.cc DEPS place device_context framework_proto op_kernel_type)
......@@ -393,10 +393,6 @@ cc_test(tuple_test SRCS tuple_test.cc )
cc_test(inlined_vector_test SRCS inlined_vector_test.cc)
if (NOT WIN32)
cc_test(rw_lock_test SRCS rw_lock_test.cc)
endif (NOT WIN32)
cc_library(dlpack_tensor SRCS dlpack_tensor.cc DEPS tensor dlpack)
cc_test(dlpack_tensor_test SRCS dlpack_tensor_test.cc DEPS dlpack_tensor glog)
......
paddle/fluid/framework/data_transform.cc
浏览文件 @ 2bafd338
......@@ -120,9 +120,9 @@ void SetTensorToVariable(const Variable &in_var, const Tensor &tensor,
tran_lod_tensor->set_format(in_lod_tensor.format());
#endif
tran_lod_tensor->ShareDataWith(tensor);
} else if (in_var.IsType<SelectedRows>()) {
auto &in_selected_rows = in_var.Get<SelectedRows>();
auto *trans_selected_rows = out_var->GetMutable<SelectedRows>();
} else if (in_var.IsType<pten::SelectedRows>()) {
auto &in_selected_rows = in_var.Get<pten::SelectedRows>();
auto *trans_selected_rows = out_var->GetMutable<pten::SelectedRows>();
trans_selected_rows->set_height(in_selected_rows.height());
trans_selected_rows->set_rows(in_selected_rows.rows());
trans_selected_rows->mutable_value()->ShareDataWith(tensor);
......
paddle/fluid/framework/details/broadcast_op_handle_test.h
浏览文件 @ 2bafd338
......@@ -237,7 +237,7 @@ struct TestBroadcastOpHandle {
PADDLE_ENFORCE_NOT_NULL(
var, platform::errors::NotFound("Variable %s is not found in scope.",
varname));
auto selected_rows = var->GetMutable<f::SelectedRows>();
auto selected_rows = var->GetMutable<pten::SelectedRows>();
auto value = selected_rows->mutable_value();
value->mutable_data<float>(kDims, place_list_[input_scope_idx]);
selected_rows->set_height(height);
......@@ -256,7 +256,7 @@ struct TestBroadcastOpHandle {
PADDLE_ENFORCE_NOT_NULL(
var, platform::errors::NotFound("Variable %s is not found in scope.",
varname));
auto& selected_rows = var->Get<f::SelectedRows>();
auto& selected_rows = var->Get<pten::SelectedRows>();
auto rt = selected_rows.value();
PADDLE_ENFORCE_EQ(selected_rows.height(), height,
platform::errors::InvalidArgument(
......
paddle/fluid/framework/details/eager_deletion_op_handle.cc
浏览文件 @ 2bafd338
......@@ -129,9 +129,10 @@ void EagerDeletionOpHandle::RunImpl() {
if (var->IsType<LoDTensor>()) {
garbages.emplace_back(var->GetMutable<LoDTensor>()->MoveMemoryHolder());
} else if (var->IsType<SelectedRows>()) {
garbages.emplace_back(
var->GetMutable<SelectedRows>()->mutable_value()->MoveMemoryHolder());
} else if (var->IsType<pten::SelectedRows>()) {
garbages.emplace_back(var->GetMutable<pten::SelectedRows>()
->mutable_value()
->MoveMemoryHolder());
} else if (var->IsType<LoDTensorArray>()) {
auto *tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto &t : *tensor_arr) {
......
paddle/fluid/framework/details/gather_op_handle.cc
浏览文件 @ 2bafd338
......@@ -64,14 +64,14 @@ void GatherOpHandle::RunImpl() {
platform::errors::NotFound("The variable '%s' is not found in the scope.",
in_0_handle->name()));
PADDLE_ENFORCE_EQ(pre_in_var->IsType<framework::SelectedRows>(), true,
PADDLE_ENFORCE_EQ(pre_in_var->IsType<pten::SelectedRows>(), true,
platform::errors::Unimplemented(
"Currently, gather_op only supports SelectedRows."));
// Wait input done, this Wait is asynchronous operation
WaitInputVarGenerated();
auto &pre_in_value = pre_in_var->Get<framework::SelectedRows>();
auto &pre_in_value = pre_in_var->Get<pten::SelectedRows>();
std::vector<int64_t> out_rows;
std::vector<Tensor> in_tensors;
......@@ -85,7 +85,7 @@ void GatherOpHandle::RunImpl() {
"The variable '%s' is not found in the scope.", in_handle->name()));
VariableVisitor::EnforceShapeAndDTypeEQ(*in_var, *pre_in_var);
auto &in_sr_value = in_var->Get<framework::SelectedRows>();
auto &in_sr_value = in_var->Get<pten::SelectedRows>();
auto &in_sr_rows = in_sr_value.rows();
out_rows.insert(out_rows.end(), in_sr_rows.begin(), in_sr_rows.end());
......@@ -108,7 +108,7 @@ void GatherOpHandle::RunImpl() {
out_var,
platform::errors::NotFound("The variable '%s' is not found in the scope.",
out_var_handle->name()));
auto out_value = out_var->GetMutable<framework::SelectedRows>();
auto out_value = out_var->GetMutable<pten::SelectedRows>();
out_value->set_height(pre_in_value.height());
out_value->set_rows(out_rows);
size_t rows = out_rows.size();
......
paddle/fluid/framework/details/gather_op_handle_test.cc
浏览文件 @ 2bafd338
......@@ -146,7 +146,7 @@ struct TestGatherOpHandle {
PADDLE_ENFORCE_NOT_NULL(
in_var, platform::errors::NotFound(
"The variable '%s' is not found in the scope.", "input"));
auto in_selected_rows = in_var->GetMutable<f::SelectedRows>();
auto in_selected_rows = in_var->GetMutable<pten::SelectedRows>();
auto value = in_selected_rows->mutable_value();
value->mutable_data<float>(kDims, gpu_list_[input_scope_idx]);
......@@ -162,10 +162,10 @@ struct TestGatherOpHandle {
PADDLE_ENFORCE_NOT_NULL(
out_var, platform::errors::NotFound(
"The variable '%s' is not found in the scope.", "out"));
auto out_selected_rows = out_var->GetMutable<f::SelectedRows>();
auto out_selected_rows = out_var->GetMutable<pten::SelectedRows>();
auto in_var = param_scopes_.at(output_scope_idx)->FindVar("input");
auto in_selected_rows = in_var->GetMutable<f::SelectedRows>();
auto in_selected_rows = in_var->GetMutable<pten::SelectedRows>();
out_selected_rows->mutable_value()->ShareDataWith(
in_selected_rows->value());
......@@ -177,7 +177,7 @@ struct TestGatherOpHandle {
p::CPUPlace cpu_place;
auto& out_select_rows = out_var->Get<f::SelectedRows>();
auto& out_select_rows = out_var->Get<pten::SelectedRows>();
auto rt = out_select_rows.value();
PADDLE_ENFORCE_EQ(out_select_rows.height(), height,
......
paddle/fluid/framework/details/nan_inf_utils_detail.cc
浏览文件 @ 2bafd338
......@@ -321,8 +321,8 @@ void CheckVarHasNanOrInf(const std::string& op_type,
const Tensor* tensor{nullptr};
if (var->IsType<framework::LoDTensor>()) {
tensor = &var->Get<framework::LoDTensor>();
} else if (var->IsType<framework::SelectedRows>()) {
tensor = &var->Get<framework::SelectedRows>().value();
} else if (var->IsType<pten::SelectedRows>()) {
tensor = &var->Get<pten::SelectedRows>().value();
} else {
VLOG(10) << var_name << " var_name need not to check";
return;
......@@ -468,8 +468,8 @@ void PrintNpuVarInfo(const std::string& op_type, const std::string& var_name,
const Tensor* tensor{nullptr};
if (var->IsType<framework::LoDTensor>()) {
tensor = &var->Get<framework::LoDTensor>();
} else if (var->IsType<framework::SelectedRows>()) {
tensor = &var->Get<framework::SelectedRows>().value();
} else if (var->IsType<pten::SelectedRows>()) {
tensor = &var->Get<pten::SelectedRows>().value();
} else {
VLOG(10) << var_name << " var_name need not to check";
return;
......
paddle/fluid/framework/details/reduce_and_gather.h
浏览文件 @ 2bafd338
......@@ -20,6 +20,11 @@
#include "paddle/fluid/framework/details/reduce_and_gather.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/selected_rows_utils.h"
namespace pten {
class SelectedRows;
} // namespace pten
namespace paddle {
namespace framework {
namespace details {
......@@ -96,10 +101,10 @@ struct ReduceBufferData {
struct GatherLocalSelectedRowsFunctor {
GatherLocalSelectedRowsFunctor(
const std::vector<const SelectedRows *> &src_selected_rows,
const std::vector<const pten::SelectedRows *> &src_selected_rows,
const std::vector<platform::Place> &in_places,
const std::map<platform::Place, platform::DeviceContext *> &dev_ctxes,
const platform::Place &out_place, SelectedRows *dst_selected_rows)
const platform::Place &out_place, pten::SelectedRows *dst_selected_rows)
: dev_ctxes_(dev_ctxes),
in_places_(in_places),
out_place_(out_place),
......@@ -147,7 +152,7 @@ struct GatherLocalSelectedRowsFunctor {
std::vector<Tensor> in_tensors_;
platform::Place out_place_;
SelectedRows *dst_selected_rows_;
pten::SelectedRows *dst_selected_rows_;
};
} // namespace details
......
paddle/fluid/framework/details/reduce_op_handle.cc
浏览文件 @ 2bafd338
......@@ -114,10 +114,10 @@ void ReduceOpHandle::RunImpl() {
t_out_p = platform::CPUPlace();
}
if (pre_in_var->IsType<framework::SelectedRows>()) {
if (pre_in_var->IsType<pten::SelectedRows>()) {
this->RunAndRecordEvent([&] {
std::vector<const SelectedRows *> in_selected_rows =
GetInputValues<SelectedRows>(in_var_handles, var_scopes);
std::vector<const pten::SelectedRows *> in_selected_rows =
GetInputValues<pten::SelectedRows>(in_var_handles, var_scopes);
const CollectiveContext &collective_context =
*CollectiveContext::GetInstance();
......@@ -130,7 +130,7 @@ void ReduceOpHandle::RunImpl() {
platform::is_cpu_place(t_out_p)) {
GatherLocalSelectedRowsFunctor functor(
in_selected_rows, in_places, dev_ctxes_, t_out_p,
out_var->GetMutable<framework::SelectedRows>());
out_var->GetMutable<pten::SelectedRows>());
WaitInputVarGenerated();
functor();
return;
......
paddle/fluid/framework/details/reduce_op_handle.h
浏览文件 @ 2bafd338
......@@ -27,7 +27,6 @@
namespace paddle {
namespace framework {
class SelectedRows;
namespace details {
struct VarHandle;
......@@ -131,11 +130,11 @@ struct ReduceOpHandle : public OpHandleBase {
defined PADDLE_WITH_DISTRIBUTE
template <typename DevCtx, typename DataType>
void GatherSelectedRows(
const std::vector<const SelectedRows *> &src_selecte_rows_,
const std::vector<const pten::SelectedRows *> &src_selecte_rows_,
const std::vector<platform::Place> &in_places,
const std::map<platform::Place, platform::DeviceContext *> &dev_ctxes,
VarHandle *out_var_handle, const platform::Place &out_place,
SelectedRows *dst_selecte_rows);
pten::SelectedRows *dst_selecte_rows);
#endif
void Wait(
......
paddle/fluid/framework/details/reduce_op_handle_test.cc
浏览文件 @ 2bafd338
......@@ -174,7 +174,7 @@ struct TestReduceOpHandle {
PADDLE_ENFORCE_NOT_NULL(
in_var, platform::errors::NotFound(
"Variable %s is not found in scope.", "input"));
auto in_selected_rows = in_var->GetMutable<f::SelectedRows>();
auto in_selected_rows = in_var->GetMutable<pten::SelectedRows>();
auto value = in_selected_rows->mutable_value();
value->mutable_data<float>(kDims, gpu_list_[input_scope_idx]);
......@@ -190,10 +190,10 @@ struct TestReduceOpHandle {
PADDLE_ENFORCE_NOT_NULL(out_var,
platform::errors::NotFound(
"Variable %s is not found in scope.", "out"));
auto out_selected_rows = out_var->GetMutable<f::SelectedRows>();
auto out_selected_rows = out_var->GetMutable<pten::SelectedRows>();
auto in_var = param_scopes_[output_scope_idx]->FindVar("input");
auto in_selected_rows = in_var->GetMutable<f::SelectedRows>();
auto in_selected_rows = in_var->GetMutable<pten::SelectedRows>();
out_selected_rows->mutable_value()->ShareDataWith(
in_selected_rows->value());
......@@ -205,7 +205,7 @@ struct TestReduceOpHandle {
p::CPUPlace cpu_place;
auto &out_select_rows = out_var->Get<f::SelectedRows>();
auto &out_select_rows = out_var->Get<pten::SelectedRows>();
auto rt = out_select_rows.value();
PADDLE_ENFORCE_EQ(out_select_rows.height(), height,
......
paddle/fluid/framework/details/scope_buffered_monitor.cc
浏览文件 @ 2bafd338
......@@ -33,9 +33,9 @@ static void GetTensors(Variable *var,
std::unordered_set<Tensor *> *tensor_set) {
if (var->IsType<LoDTensor>() && var->Get<LoDTensor>().IsInitialized()) {
tensor_set->insert(var->GetMutable<LoDTensor>());
} else if (var->IsType<SelectedRows>() &&
var->Get<SelectedRows>().value().IsInitialized()) {
tensor_set->insert(var->GetMutable<SelectedRows>()->mutable_value());
} else if (var->IsType<pten::SelectedRows>() &&
var->Get<pten::SelectedRows>().value().IsInitialized()) {
tensor_set->insert(var->GetMutable<pten::SelectedRows>()->mutable_value());
} else if (var->IsType<LoDTensorArray>()) {
auto *tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto &t : *tensor_arr) {
......
paddle/fluid/framework/details/variable_visitor.cc
浏览文件 @ 2bafd338
......@@ -33,8 +33,8 @@ template <typename Func>
static void VisitVariable(Variable* var, Func* func) {
if (var->IsType<LoDTensor>()) {
(*func)(var->GetMutable<LoDTensor>());
} else if (var->IsType<SelectedRows>()) {
(*func)(var->GetMutable<SelectedRows>());
} else if (var->IsType<pten::SelectedRows>()) {
(*func)(var->GetMutable<pten::SelectedRows>());
} else {
PADDLE_THROW(platform::errors::Unimplemented(
"VisitVariable is not supported for type %s.",
......@@ -46,8 +46,8 @@ template <typename Func>
static void VisitVariable(const Variable& var, Func* func) {
if (var.IsType<LoDTensor>()) {
(*func)(var.Get<LoDTensor>());
} else if (var.IsType<SelectedRows>()) {
(*func)(var.Get<SelectedRows>());
} else if (var.IsType<pten::SelectedRows>()) {
(*func)(var.Get<pten::SelectedRows>());
} else {
PADDLE_THROW(platform::errors::Unimplemented(
"VisitVariable is not supported for type %s.", ToTypeName(var.Type())));
......@@ -59,7 +59,7 @@ struct TensorVisitor {
void operator()(LoDTensor* tensor) { result_ = tensor; }
void operator()(SelectedRows* selected_rows) {
void operator()(pten::SelectedRows* selected_rows) {
result_ = selected_rows->mutable_value();
}
......@@ -85,8 +85,8 @@ struct ShareDimsAndLoDVisitor {
tensor->Resize(val.dims());
}
void operator()(const SelectedRows& val) {
auto* selected_rows = trg_->GetMutable<SelectedRows>();
void operator()(const pten::SelectedRows& val) {
auto* selected_rows = trg_->GetMutable<pten::SelectedRows>();
selected_rows->set_rows(val.rows());
selected_rows->set_height(val.height());
selected_rows->mutable_value()->Resize(val.value().dims());
......@@ -131,8 +131,8 @@ struct EnforceShapeAndDTypeEQVisitor {
"The layout of the two variables' tensors tensor is not equal."));
}
void operator()(const SelectedRows& src) {
auto& selected_rows = dst_->Get<SelectedRows>();
void operator()(const pten::SelectedRows& src) {
auto& selected_rows = dst_->Get<pten::SelectedRows>();
PADDLE_ENFORCE_EQ(
src.place().GetType(), selected_rows.place().GetType(),
platform::errors::PreconditionNotMet(
......
paddle/fluid/framework/downpour_worker.cc
浏览文件 @ 2bafd338
......@@ -815,8 +815,8 @@ void DownpourWorker::TrainFiles() {
if (var->IsType<framework::LoDTensor>()) {
tensor = var->GetMutable<LoDTensor>();
len = tensor->numel();
} else if (var->IsType<SelectedRows>()) {
auto selected_rows = var->GetMutable<SelectedRows>();
} else if (var->IsType<pten::SelectedRows>()) {
auto selected_rows = var->GetMutable<pten::SelectedRows>();
tensor = selected_rows->mutable_value();
len = tensor->numel();
}
......
paddle/fluid/framework/executor_gc_helper.cc
浏览文件 @ 2bafd338
......@@ -147,9 +147,10 @@ void DeleteUnusedTensors(const Scope &scope,
VLOG(2) << "Erase variable " << var_name;
if (var->IsType<LoDTensor>()) {
garbages.emplace_back(var->GetMutable<LoDTensor>()->MoveMemoryHolder());
} else if (var->IsType<SelectedRows>()) {
garbages.emplace_back(
var->GetMutable<SelectedRows>()->mutable_value()->MoveMemoryHolder());
} else if (var->IsType<pten::SelectedRows>()) {
garbages.emplace_back(var->GetMutable<pten::SelectedRows>()
->mutable_value()
->MoveMemoryHolder());
} else if (var->IsType<LoDTensorArray>()) {
auto *lod_tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto &t : *lod_tensor_arr) {
......
paddle/fluid/framework/fleet/heter_ps/hashtable.h
浏览文件 @ 2bafd338
......@@ -23,7 +23,7 @@ limitations under the License. */
#ifdef PADDLE_WITH_PSCORE
#include "paddle/fluid/distributed/table/depends/large_scale_kv.h"
#endif
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/pten/core/utils/rw_lock.h"
#include "thrust/pair.h"
// #include "cudf/concurrent_unordered_map.cuh.h"
#include "paddle/fluid/framework/fleet/heter_ps/cudf/concurrent_unordered_map.cuh.h"
......@@ -81,7 +81,7 @@ class HashTable {
<< " push value size: " << push_grad_value_size_;
}
std::unique_ptr<RWLock> rwlock_{nullptr};
std::unique_ptr<pten::RWLock> rwlock_{nullptr};
private:
TableContainer<KeyType, ValType>* container_;
......
paddle/fluid/framework/fleet/heter_ps/hashtable_inl.h
浏览文件 @ 2bafd338
......@@ -121,7 +121,7 @@ __global__ void dy_mf_update_kernel(Table* table,
template <typename KeyType, typename ValType>
HashTable<KeyType, ValType>::HashTable(size_t capacity) {
container_ = new TableContainer<KeyType, ValType>(capacity);
rwlock_.reset(new RWLock);
rwlock_.reset(new pten::RWLock);
}
template <typename KeyType, typename ValType>
......
paddle/fluid/framework/multi_trainer.cc
浏览文件 @ 2bafd338
......@@ -136,7 +136,7 @@ void MultiTrainer::InitTrainerEnv(const ProgramDesc& main_program,
if (!root_var) {
continue;
}
if (root_var->IsType<SelectedRows>()) {
if (root_var->IsType<pten::SelectedRows>()) {
continue;
}
LoDTensor* root_tensor = root_var->GetMutable<LoDTensor>();
......
paddle/fluid/framework/new_executor/data_transfer.cc
浏览文件 @ 2bafd338
......@@ -259,7 +259,7 @@ void ApplyDataTransform(const OpKernelType& expected_kernel_key,
auto var = var_name_item.second[i];
auto& var_name = new_ins[var_name_item.first].at(i);
const Tensor* tensor_in;
if (var->IsType<LoDTensor>() || var->IsType<SelectedRows>()) {
if (var->IsType<LoDTensor>() || var->IsType<pten::SelectedRows>()) {
tensor_in = GetLoDTensorOrSelectedRowsValueFromVar(*var);
} else if (var->IsType<LoDTensorArray>()) {
tensor_in =
......
paddle/fluid/framework/new_executor/interpretercore.cc
浏览文件 @ 2bafd338
......@@ -676,8 +676,9 @@ void InterpreterCore::RecordStreamForGC(const Instruction& instr) {
operators::reader::
OrderedMultiDeviceLoDTensorBlockingQueueHolder>()) {
// do nothing
} else if (var->IsType<SelectedRows>()) {
TensorRecordStream(*(var->GetMutable<SelectedRows>()->mutable_value()));
} else if (var->IsType<pten::SelectedRows>()) {
TensorRecordStream(
*(var->GetMutable<pten::SelectedRows>()->mutable_value()));
} else if (var->IsType<LoDTensorArray>()) {
auto* tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto& tensor : *tensor_arr) {
......
paddle/fluid/framework/new_executor/interpretercore_event_garbage_collector.cc
浏览文件 @ 2bafd338
......@@ -76,10 +76,12 @@ void InterpreterCoreEventGarbageCollector::Add(
} else if (var->IsType<LoDRankTable>()) {
// TODO(xiongkun03) in old executor, this type of variable is not support
// eager deletion. so we just leave it here ?
} else if (var->IsType<SelectedRows>()) {
Add(var->GetMutable<SelectedRows>()->mutable_value()->MoveMemoryHolder(),
} else if (var->IsType<pten::SelectedRows>()) {
Add(var->GetMutable<pten::SelectedRows>()
->mutable_value()
->MoveMemoryHolder(),
event, ctx);
var->GetMutable<SelectedRows>()->mutable_rows()->clear();
var->GetMutable<pten::SelectedRows>()->mutable_rows()->clear();
} else if (var->IsType<LoDTensorArray>()) {
auto* tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto& t : *tensor_arr) {
......
paddle/fluid/framework/new_executor/interpretercore_fast_garbage_collector.cc
浏览文件 @ 2bafd338
......@@ -32,9 +32,11 @@ void InterpreterCoreFastGarbageCollector::Add(Variable* var) {
} else if (var->IsType<LoDRankTable>()) {
// TODO(xiongkun03) in old executor, this type of variable is not support
// eager deletion. so we just leave it here ?
} else if (var->IsType<SelectedRows>()) {
Add(var->GetMutable<SelectedRows>()->mutable_value()->MoveMemoryHolder());
var->GetMutable<SelectedRows>()->mutable_rows()->clear();
} else if (var->IsType<pten::SelectedRows>()) {
Add(var->GetMutable<pten::SelectedRows>()
->mutable_value()
->MoveMemoryHolder());
var->GetMutable<pten::SelectedRows>()->mutable_rows()->clear();
} else if (var->IsType<LoDTensorArray>()) {
auto* tensor_arr = var->GetMutable<LoDTensorArray>();
for (auto& t : *tensor_arr) {
......
paddle/fluid/framework/new_executor/interpretercore_util.cc
浏览文件 @ 2bafd338
......@@ -468,8 +468,8 @@ void build_op_func_list(const platform::Place& place,
if (var->IsType<LoDTensor>()) {
garbages->emplace_back(
var->GetMutable<LoDTensor>()->MoveMemoryHolder());
} else if (var->IsType<SelectedRows>()) {
garbages->emplace_back(var->GetMutable<SelectedRows>()
} else if (var->IsType<pten::SelectedRows>()) {
garbages->emplace_back(var->GetMutable<pten::SelectedRows>()
->mutable_value()
->MoveMemoryHolder());
} else if (var->IsType<LoDTensorArray>()) {
......
paddle/fluid/framework/new_executor/new_executor_defs.cc
浏览文件 @ 2bafd338
......@@ -18,7 +18,7 @@
#include <vector>
#include "paddle/fluid/framework/new_executor/new_executor_defs.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/pten/core/utils/rw_lock.h"
// When in inference scenario, the scopes will not be written by two threads in
// a mean time, but a scope may be read by multiple threads concurrently, and
......@@ -171,9 +171,9 @@ void InterpretercoreInferShapeContext::ShareDim(const std::string& in,
platform::errors::InvalidArgument(
"The type of input (%s) and output (%s) are inconsistent.", in, out));
if (in_var->IsType<framework::SelectedRows>()) {
auto& in_sele_rows = in_var->Get<framework::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<framework::SelectedRows>();
if (in_var->IsType<pten::SelectedRows>()) {
auto& in_sele_rows = in_var->Get<pten::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<pten::SelectedRows>();
out_sele_rows->mutable_value()->Resize(in_sele_rows.value().dims());
out_sele_rows->set_rows(in_sele_rows.rows());
out_sele_rows->set_height(in_sele_rows.height());
......@@ -392,8 +392,8 @@ DDim InterpretercoreInferShapeContext::GetDim(Variable* var) const {
var, platform::errors::InvalidArgument("Input variable is nullptr."));
if (var->IsType<LoDTensor>()) {
return var->Get<LoDTensor>().dims();
} else if (var->IsType<SelectedRows>()) {
return var->Get<SelectedRows>().GetCompleteDims();
} else if (var->IsType<pten::SelectedRows>()) {
return var->Get<pten::SelectedRows>().GetCompleteDims();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Only LoDTensor or SelectedRows support 'GetDim', but input "
......@@ -420,8 +420,8 @@ std::vector<DDim> InterpretercoreInferShapeContext::GetRepeatedDims(
void InterpretercoreInferShapeContext::SetDim(Variable* var, const DDim& dim) {
if (var->IsType<LoDTensor>()) {
var->GetMutable<LoDTensor>()->Resize(dim);
} else if (var->IsType<SelectedRows>()) {
var->GetMutable<SelectedRows>()->set_height(dim[0]);
} else if (var->IsType<pten::SelectedRows>()) {
var->GetMutable<pten::SelectedRows>()->set_height(dim[0]);
} else {
PADDLE_THROW(platform::errors::Unimplemented(
"Variable type error, expect LoDTensor or SelectedRows, but received "
......
paddle/fluid/framework/new_executor/new_executor_defs.h
浏览文件 @ 2bafd338
......@@ -19,10 +19,10 @@
#include <vector>
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/variable_helper.h"
#include "paddle/fluid/platform/device_event_base.h"
#include "paddle/fluid/platform/event.h"
#include "paddle/pten/core/utils/rw_lock.h"
// When in inference scenario, the scopes will not be written by two threads in
// a mean time, but a scope may be read by multiple threads concurrently, and
......
paddle/fluid/framework/operator.cc
浏览文件 @ 2bafd338
......@@ -77,11 +77,11 @@ static DDim GetDimsDebug(const ScopeBase& scope, const std::string& name,
if (var->IsType<LoDTensor>()) {
const LoDTensor& tensor = var->Get<LoDTensor>();
return tensor.dims();
} else if (var->IsType<SelectedRows>()) {
} else if (var->IsType<pten::SelectedRows>()) {
if (get_actual_dim) {
return var->Get<SelectedRows>().value().dims();
return var->Get<pten::SelectedRows>().value().dims();
} else {
return var->Get<SelectedRows>().GetCompleteDims();
return var->Get<pten::SelectedRows>().GetCompleteDims();
}
} else if (var->IsType<Strings>()) {
return DDim({static_cast<int64_t>(var->Get<Strings>().size())});
......@@ -108,8 +108,8 @@ static std::string GetDtype(const ScopeBase& scope, const std::string& name) {
return "";
}
return DataTypeToString(tensor.type());
} else if (var->IsType<SelectedRows>()) {
auto tensor = var->Get<SelectedRows>().value();
} else if (var->IsType<pten::SelectedRows>()) {
auto tensor = var->Get<pten::SelectedRows>().value();
if (UNLIKELY(!tensor.IsInitialized())) {
return "uninited";
} else {
......@@ -139,8 +139,8 @@ static std::string GetPlace(const ScopeBase& scope, const std::string& name) {
return "";
}
return to_string(tensor.place());
} else if (var->IsType<SelectedRows>()) {
auto tensor = var->Get<SelectedRows>().value();
} else if (var->IsType<pten::SelectedRows>()) {
auto tensor = var->Get<pten::SelectedRows>().value();
if (UNLIKELY(!tensor.IsInitialized())) {
return "uninited";
} else {
......@@ -157,8 +157,8 @@ static int GetRowSize(const ScopeBase& scope, const std::string& name) {
return -1;
}
if (var->IsType<SelectedRows>()) {
return var->Get<SelectedRows>().rows().size();
if (var->IsType<pten::SelectedRows>()) {
return var->Get<pten::SelectedRows>().rows().size();
}
return -1;
......@@ -497,8 +497,8 @@ void OperatorBase::GenerateTemporaryNames() {
const Tensor* GetLoDTensorOrSelectedRowsValueFromVar(const Variable& var) {
if (var.IsType<LoDTensor>()) {
return static_cast<const Tensor*>(&(var.Get<LoDTensor>()));
} else if (var.IsType<SelectedRows>()) {
return &(var.Get<SelectedRows>().value());
} else if (var.IsType<pten::SelectedRows>()) {
return &(var.Get<pten::SelectedRows>().value());
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Variable type is %s, expect LoDTensor or SelectedRows.",
......@@ -509,8 +509,8 @@ const Tensor* GetLoDTensorOrSelectedRowsValueFromVar(const Variable& var) {
Tensor* GetMutableLoDTensorOrSelectedRowsValueFromVar(Variable* var) {
if (var->IsType<LoDTensor>()) {
return var->GetMutable<LoDTensor>();
} else if (var->IsType<SelectedRows>()) {
return var->GetMutable<SelectedRows>()->mutable_value();
} else if (var->IsType<pten::SelectedRows>()) {
return var->GetMutable<pten::SelectedRows>()->mutable_value();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Variable type is %s, expect LoDTensor or SelectedRows.",
......@@ -741,9 +741,9 @@ class RuntimeInferShapeContext : public InferShapeContext {
"The type of input (%s) and output (%s) are inconsistent.", in,
out));
if (in_var->IsType<framework::SelectedRows>()) {
auto& in_sele_rows = in_var->Get<framework::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<framework::SelectedRows>();
if (in_var->IsType<pten::SelectedRows>()) {
auto& in_sele_rows = in_var->Get<pten::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<pten::SelectedRows>();
out_sele_rows->mutable_value()->Resize(in_sele_rows.value().dims());
out_sele_rows->set_rows(in_sele_rows.rows());
out_sele_rows->set_height(in_sele_rows.height());
......@@ -950,8 +950,8 @@ class RuntimeInferShapeContext : public InferShapeContext {
var, platform::errors::InvalidArgument("Input variable is nullptr."));
if (var->IsType<LoDTensor>()) {
return var->Get<LoDTensor>().dims();
} else if (var->IsType<SelectedRows>()) {
return var->Get<SelectedRows>().GetCompleteDims();
} else if (var->IsType<pten::SelectedRows>()) {
return var->Get<pten::SelectedRows>().GetCompleteDims();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Only LoDTensor or SelectedRows support 'GetDim', but input "
......@@ -976,8 +976,8 @@ class RuntimeInferShapeContext : public InferShapeContext {
void SetDim(Variable* var, const DDim& dim) {
if (var->IsType<LoDTensor>()) {
var->GetMutable<LoDTensor>()->Resize(dim);
} else if (var->IsType<SelectedRows>()) {
var->GetMutable<SelectedRows>()->set_height(dim[0]);
} else if (var->IsType<pten::SelectedRows>()) {
var->GetMutable<pten::SelectedRows>()->set_height(dim[0]);
} else {
PADDLE_THROW(platform::errors::Unimplemented(
"Variable type error, expect LoDTensor or SelectedRows, but received "
......@@ -1646,8 +1646,8 @@ void OperatorWithKernel::ParseInputDataType(
t = &var->Get<Tensor>();
} else if (var->IsType<LoDTensor>()) {
t = &var->Get<LoDTensor>();
} else if (var->IsType<SelectedRows>()) {
t = &(var->Get<SelectedRows>().value());
} else if (var->IsType<pten::SelectedRows>()) {
t = &(var->Get<pten::SelectedRows>().value());
} else if (var->IsType<LoDTensorArray>()) {
auto t_arr = &var->Get<LoDTensorArray>();
for (size_t j = 0; j < t_arr->size(); j++) {
......@@ -1728,8 +1728,8 @@ Tensor* OperatorWithKernel::GetTensorFormInputSafely(
t = var->GetMutable<Tensor>();
} else if (var->IsType<LoDTensor>()) {
t = var->GetMutable<LoDTensor>();
} else if (var->IsType<SelectedRows>()) {
t = var->GetMutable<SelectedRows>()->mutable_value();
} else if (var->IsType<pten::SelectedRows>()) {
t = var->GetMutable<pten::SelectedRows>()->mutable_value();
} else {
PADDLE_THROW(platform::errors::Unimplemented(
"Unsupported input variable type in complex type promotion."));
......
paddle/fluid/framework/operator.h
浏览文件 @ 2bafd338
......@@ -117,7 +117,7 @@ inline std::string GradOriginalVarName(const std::string& grad_var_name) {
}
inline bool VarIsTensor(const Variable& var) {
return var.IsType<LoDTensor>() || var.IsType<SelectedRows>();
return var.IsType<LoDTensor>() || var.IsType<pten::SelectedRows>();
}
const Tensor* GetLoDTensorOrSelectedRowsValueFromVar(const Variable& var);
......@@ -473,7 +473,7 @@ class ExecutionArgumentMappingContext : public pten::ArgumentMappingContext {
}
bool IsSelectedRowsInput(const std::string& name) const override {
return ctx_.InputVar(name)->IsType<framework::SelectedRows>();
return ctx_.InputVar(name)->IsType<pten::SelectedRows>();
}
private:
......
paddle/fluid/framework/operator_test.cc
浏览文件 @ 2bafd338
......@@ -456,7 +456,7 @@ TEST(IndicateVarDataTypeTest, selectedrows) {
auto op = paddle::framework::OpRegistry::CreateOp(op_desc);
auto* var = scope.Var("selected_rows_1");
var->GetMutable<paddle::framework::SelectedRows>();
var->GetMutable<pten::SelectedRows>();
bool caught = false;
try {
......
paddle/fluid/framework/paddle2cinn/cinn_compiler.cc
浏览文件 @ 2bafd338
......@@ -38,12 +38,12 @@
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/inference/analysis/dot.h"
#include "paddle/fluid/operators/cinn/cinn_launch_context.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/string/string_helper.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
namespace framework {
......@@ -75,7 +75,7 @@ const CinnCompiledObject& CinnCompiler::Compile(
bool exist = false;
{
AutoRDLock r_guard{&rwlock_};
pten::AutoRDLock r_guard{&rwlock_};
exist = cache_by_address_.count(cur_key_by_address) != 0;
// if cannot find graph by address, checkout whether the graph structure
// have been stored in cache.
......@@ -96,13 +96,13 @@ const CinnCompiledObject& CinnCompiler::Compile(
std::int64_t compiled_num = real_compiled_num_.fetch_add(1);
auto compiled_res =
CompileGraph(graph, input_tensors, target, compiled_num, stream);
AutoWRLock w_guard{&rwlock_};
pten::AutoWRLock w_guard{&rwlock_};
if (!cache_by_struct_.count(cur_key_by_struct)) {
cache_by_address_[cur_key_by_address] = compiled_res.get();
cache_by_struct_[cur_key_by_struct] = std::move(compiled_res);
}
}
AutoRDLock guard{&rwlock_};
pten::AutoRDLock guard{&rwlock_};
const auto& cached_boj = *cache_by_address_[cur_key_by_address];
return cached_boj;
}
......@@ -198,7 +198,7 @@ std::string CinnCompiler::ReadableKey(
void CinnCompiler::Clear() {
{
AutoWRLock guard{&rwlock_};
pten::AutoWRLock guard{&rwlock_};
graphs_.clear();
cache_by_address_.clear();
cache_by_struct_.clear();
......
paddle/fluid/framework/paddle2cinn/cinn_compiler.h
浏览文件 @ 2bafd338
......@@ -26,9 +26,9 @@
#include "paddle/fluid/framework/ir/graph.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/paddle2cinn/cinn_cache_key.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/scope.h"
#include "paddle/fluid/platform/macros.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
......@@ -102,7 +102,7 @@ class CinnCompiler {
std::unique_ptr<CinnCompiledObject>, CinnCacheKey::Hash>
cache_by_struct_;
std::atomic_int64_t real_compiled_num_{0};
mutable RWLock rwlock_;
mutable pten::RWLock rwlock_;
DISABLE_COPY_AND_ASSIGN(CinnCompiler);
};
......
paddle/fluid/framework/rw_lock.h 已删除 100644 → 0
浏览文件 @ 3825b40f
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#pragma once
#if !defined(_WIN32)
#include <pthread.h>
#else
#include <mutex> // NOLINT
#endif // !_WIN32
#include "paddle/fluid/platform/enforce.h"
namespace paddle {
namespace framework {
#if !defined(_WIN32)
struct RWLock {
RWLock() { pthread_rwlock_init(&lock_, nullptr); }
~RWLock() { pthread_rwlock_destroy(&lock_); }
inline void RDLock() {
PADDLE_ENFORCE_EQ(
pthread_rwlock_rdlock(&lock_), 0,
platform::errors::External("The pthread failed to acquire read lock."));
}
inline void WRLock() {
PADDLE_ENFORCE_EQ(pthread_rwlock_wrlock(&lock_), 0,
platform::errors::External(
"The pthread failed to acquire write lock."));
}
inline void UNLock() {
PADDLE_ENFORCE_EQ(
pthread_rwlock_unlock(&lock_), 0,
platform::errors::External("The pthread failed to unlock."));
}
private:
pthread_rwlock_t lock_;
};
// TODO(paddle-dev): Support RWLock for WIN32 for correctness.
#else
// https://stackoverflow.com/questions/7125250/making-pthread-rwlock-wrlock-recursive
// In windows, rw_lock seems like a hack. Use empty object and do nothing.
struct RWLock {
// FIXME(minqiyang): use mutex here to do fake lock
inline void RDLock() { mutex_.lock(); }
inline void WRLock() { mutex_.lock(); }
inline void UNLock() { mutex_.unlock(); }
private:
std::mutex mutex_;
};
#endif
class AutoWRLock {
public:
explicit AutoWRLock(RWLock* rw_lock) : lock_(rw_lock) { Lock(); }
~AutoWRLock() { UnLock(); }
private:
inline void Lock() { lock_->WRLock(); }
inline void UnLock() { lock_->UNLock(); }
private:
RWLock* lock_;
};
class AutoRDLock {
public:
explicit AutoRDLock(RWLock* rw_lock) : lock_(rw_lock) { Lock(); }
~AutoRDLock() { UnLock(); }
private:
inline void Lock() { lock_->RDLock(); }
inline void UnLock() { lock_->UNLock(); }
private:
RWLock* lock_;
};
} // namespace framework
} // namespace paddle
paddle/fluid/framework/rw_lock_test.cc 已删除 100644 → 0
浏览文件 @ 3825b40f
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/framework/rw_lock.h"
#include <gtest/gtest.h>
#include <thread> // NOLINT
namespace f = paddle::framework;
void f1(f::RWLock *lock) {
lock->RDLock();
lock->UNLock();
}
TEST(RWLOCK, read_read) {
f::RWLock lock;
lock.RDLock();
std::thread t1(f1, &lock);
std::thread t2(f1, &lock);
t1.join();
t2.join();
lock.UNLock();
}
void f2(f::RWLock *lock, std::vector<int> *result) {
lock->RDLock();
ASSERT_EQ(result->size(), 0UL);
lock->UNLock();
}
void f3(f::RWLock *lock, std::vector<int> *result) {
lock->WRLock();
result->push_back(1);
lock->UNLock();
}
TEST(RWLOCK, read_write) {
f::RWLock lock;
std::vector<int> result;
lock.RDLock();
std::thread t1(f2, &lock, &result);
t1.join();
std::thread t2(f3, &lock, &result);
std::this_thread::sleep_for(std::chrono::seconds(1));
ASSERT_EQ(result.size(), 0UL);
lock.UNLock();
t2.join();
ASSERT_EQ(result.size(), 1UL);
}
void f4(f::RWLock *lock, std::vector<int> *result) {
lock->RDLock();
ASSERT_EQ(result->size(), 1UL);
lock->UNLock();
}
TEST(RWLOCK, write_read) {
f::RWLock lock;
std::vector<int> result;
lock.WRLock();
std::thread t1(f4, &lock, &result);
std::this_thread::sleep_for(std::chrono::seconds(1));
result.push_back(1);
lock.UNLock();
t1.join();
}
paddle/fluid/framework/scope.cc
浏览文件 @ 2bafd338
......@@ -34,10 +34,10 @@ PADDLE_DEFINE_EXPORTED_bool(
#define SCOPE_VARS_READER_LOCK
#define SCOPE_VARS_WRITER_LOCK
#else
#define SCOPE_KIDS_READER_LOCK AutoRDLock auto_lock(&kids_lock_);
#define SCOPE_KIDS_WRITER_LOCK AutoWRLock auto_lock(&kids_lock_);
#define SCOPE_VARS_READER_LOCK AutoRDLock auto_lock(&vars_lock_);
#define SCOPE_VARS_WRITER_LOCK AutoWRLock auto_lock(&vars_lock_);
#define SCOPE_KIDS_READER_LOCK pten::AutoRDLock auto_lock(&kids_lock_);
#define SCOPE_KIDS_WRITER_LOCK pten::AutoWRLock auto_lock(&kids_lock_);
#define SCOPE_VARS_READER_LOCK pten::AutoRDLock auto_lock(&vars_lock_);
#define SCOPE_VARS_WRITER_LOCK pten::AutoWRLock auto_lock(&vars_lock_);
#endif
namespace paddle {
......
paddle/fluid/framework/scope.h
浏览文件 @ 2bafd338
......@@ -26,9 +26,9 @@ extern "C" {
#include <utility>
#include <vector>
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/platform/macros.h"
#include "paddle/pten/core/utils/rw_lock.h"
namespace paddle {
namespace framework {
......@@ -194,8 +194,8 @@ class Scope : public ScopeBase {
#ifndef PADDLE_ON_INFERENCE
private:
mutable RWLock kids_lock_;
mutable RWLock vars_lock_;
mutable pten::RWLock kids_lock_;
mutable pten::RWLock vars_lock_;
#endif
};
......
paddle/fluid/framework/selected_rows_utils.cc
浏览文件 @ 2bafd338
......@@ -17,73 +17,8 @@ limitations under the License. */
namespace paddle {
namespace framework {
struct ReAllocateVisitor {
ReAllocateVisitor(const framework::DDim& dims, framework::Tensor* tensor)
: dims_(dims), tensor_(tensor) {}
template <typename T>
void operator()() const {
framework::Tensor cpu_tensor;
platform::CPUPlace cpu;
T* ptr = cpu_tensor.mutable_data<T>(dims_, cpu);
const T* old_ptr =
tensor_->memory_size() == 0 ? nullptr : tensor_->data<T>();
if (old_ptr != nullptr) {
std::copy(old_ptr, old_ptr + tensor_->numel(), ptr);
}
tensor_->ShareDataWith(cpu_tensor);
}
framework::DDim dims_;
framework::Tensor* tensor_;
};
struct TensorCopyVisitor {
TensorCopyVisitor(framework::Tensor* dst, int64_t dst_offset,
const framework::Tensor src, int64_t src_offset,
int64_t size)
: dst_(dst),
dst_offset_(dst_offset),
src_(src),
src_offset_(src_offset),
size_(size) {}
template <typename T>
void apply() const {
// TODO(Yancey1989): support other place
platform::CPUPlace cpu;
memory::Copy(cpu, dst_->mutable_data<T>(cpu) + dst_offset_, cpu,
src_.data<T>() + src_offset_, size_ * sizeof(T));
}
framework::Tensor* dst_;
int64_t dst_offset_;
framework::Tensor src_;
int64_t src_offset_;
int64_t size_;
};
struct TensorFillVisitor {
TensorFillVisitor(framework::Tensor* dst, int64_t dst_offset, int64_t size,
float value)
: dst_(dst), dst_offset_(dst_offset), size_(size) {}
template <typename T>
void apply() const {
// TODO(qiao): support other place
platform::CPUPlace cpu;
auto* tensor_data = dst_->mutable_data<T>(cpu);
auto* start = tensor_data + dst_offset_;
auto* end = start + size_;
std::fill(start, end, static_cast<T>(0.0));
}
framework::Tensor* dst_;
int64_t dst_offset_;
int64_t size_;
};
void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows,
void SerializeToStream(std::ostream& os,
const pten::SelectedRows& selected_rows,
const platform::DeviceContext& dev_ctx) {
{ // the 1st field, uint32_t version
constexpr uint32_t version = 0;
......@@ -107,7 +42,8 @@ void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows,
TensorToStream(os, selected_rows.value(), dev_ctx);
}
void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows) {
void SerializeToStream(std::ostream& os,
const pten::SelectedRows& selected_rows) {
platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
const platform::DeviceContext* dev_ctx;
auto place = selected_rows.place();
......@@ -115,14 +51,15 @@ void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows) {
SerializeToStream(os, selected_rows, *dev_ctx);
}
void DeserializeFromStream(std::istream& os, SelectedRows* selected_rows) {
void DeserializeFromStream(std::istream& os,
pten::SelectedRows* selected_rows) {
platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
const platform::DeviceContext* dev_ctx;
dev_ctx = pool.Get(platform::CPUPlace());
DeserializeFromStream(os, selected_rows, *dev_ctx);
}
void DeserializeFromStream(std::istream& is, SelectedRows* selected_rows,
void DeserializeFromStream(std::istream& is, pten::SelectedRows* selected_rows,
const platform::DeviceContext& dev_ctx) {
{
// the 1st field, unit32_t version for SelectedRows
......@@ -151,109 +88,5 @@ void DeserializeFromStream(std::istream& is, SelectedRows* selected_rows,
// the 4st field, tensor which contains the data
TensorFromStream(is, selected_rows->mutable_value(), dev_ctx);
}
bool SelectedRows::HasKey(int64_t key) const {
return std::find(rows_.begin(), rows_.end(), key) == rows_.end() ? false
: true;
}
int64_t SelectedRows::AutoGrownIndex(int64_t key, bool auto_grown,
bool is_test) {
if (is_test) {
auto iter = id_to_index_.find(key);
if (iter == id_to_index_.end()) {
return -1;
} else {
return iter->second;
}
}
rwlock_->RDLock();
auto iter = id_to_index_.find(key);
if (iter == id_to_index_.end()) {
rwlock_->UNLock();
PADDLE_ENFORCE_EQ(
auto_grown, true,
platform::errors::NotFound("Input key(%lld) is not found.", key));
rwlock_->WRLock();
auto map_size = id_to_index_.size();
auto vector_size = rows_.size();
if (map_size != vector_size) {
rwlock_->UNLock();
PADDLE_THROW(platform::errors::InvalidArgument(
"Row map size(%zu) should be equal to rows size(%zu).", map_size,
vector_size));
}
auto write_iter = id_to_index_.find(key);
if (write_iter == id_to_index_.end()) {
int row_num = rows_.size();
if (row_num == value_->dims()[0]) {
rwlock_->UNLock();
PADDLE_THROW(platform::errors::InvalidArgument(
"Selected rows is full, then length exceed the length of first "
"dimension (%d).",
row_num));
}
// key logic to put a key into id_to_index_
rows_.push_back(key);
auto index = static_cast<int64_t>(rows_.size() - 1);
id_to_index_[key] = index;
rwlock_->UNLock();
return index;
} else {
auto index = write_iter->second;
rwlock_->UNLock();
return index;
}
} else {
auto index = iter->second;
rwlock_->UNLock();
return index;
}
}
void SelectedRows::SyncIndex() {
rwlock_->WRLock();
id_to_index_.clear();
for (size_t i = 0; i < rows_.size(); ++i) {
id_to_index_[rows_[i]] = i;
}
rwlock_->UNLock();
}
void SelectedRows::Get(const framework::Tensor& ids, framework::Tensor* value,
bool auto_grown, bool is_test) {
PADDLE_ENFORCE_EQ(value->IsInitialized(), true,
platform::errors::InvalidArgument(
"The value tensor is not initialized."));
if (ids.numel() == 0) {
VLOG(3) << "keys is empty, please check data!";
} else {
int64_t value_width = value_->numel() / value_->dims()[0];
PADDLE_ENFORCE_EQ(
value_width, value->numel() / value->dims()[0],
platform::errors::InvalidArgument(
"Output tensor should have the same shape with table "
"except the first dimmension, excepted value width not counting "
"the first dimension is %d, actual value width is %d.",
value_width, value->numel() / value->dims()[0]));
for (int i = 0; i < ids.numel(); ++i) {
auto id = ids.data<int64_t>()[i];
int64_t index = AutoGrownIndex(id, auto_grown, is_test);
if (index < 0) {
VLOG(5) << "id " << id << " not in the table, return 0";
framework::VisitDataType(
value_->type(),
TensorFillVisitor(value, i * value_width, value_width, 0.0));
} else {
framework::VisitDataType(
value_->type(),
TensorCopyVisitor(value, i * value_width, *value_.get(),
index * value_width, value_width));
}
}
}
}
} // namespace framework
} // namespace paddle
paddle/fluid/framework/selected_rows_utils.h
浏览文件 @ 2bafd338
......@@ -21,153 +21,28 @@ limitations under the License. */
#include <utility>
#include <vector>
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/rw_lock.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/memory/memcpy.h"
#include "paddle/fluid/platform/place.h"
#include "paddle/pten/core/selected_rows.h"
#include "paddle/fluid/framework/tensor_util.h"
#include "paddle/fluid/platform/device_context.h"
namespace paddle {
namespace framework {
class SelectedRows {
/*
* @brief We can use the SelectedRows structure to reproduce a sparse table.
* A sparse table is a key-value structure that the key is an `int64_t`,
* and the value is a Tensor which the first dimension is 0.
* You can use the following interface to operate the sparse table, and you
* can find
* some detail information from the comments of each interface:
*
* HasKey(key), whether the sparse table has the specified key.
* Set(key, value), set a key-value pair into the sparse table.
* Get(keys, value*), get value by given key list and apply it to the given
* value pointer
* with the specified offset.
*
*/
public:
SelectedRows(const std::vector<int64_t>& rows, const int64_t& height)
: rows_(rows), height_(height) {
value_.reset(new Tensor());
rwlock_.reset(new RWLock);
}
SelectedRows() {
height_ = 0;
value_.reset(new Tensor());
rwlock_.reset(new RWLock);
}
const platform::Place& place() const { return value_->place(); }
const Tensor& value() const { return *value_; }
Tensor* mutable_value() { return value_.get(); }
int64_t height() const { return height_; }
void set_height(int64_t height) { height_ = height; }
const Vector<int64_t>& rows() const { return rows_; }
Vector<int64_t>* mutable_rows() { return &rows_; }
void set_rows(const Vector<int64_t>& rows) { rows_ = rows; }
/*
* @brief Get the index of key in rows
*
* @return -1 if the key does not exists.
*/
int64_t Index(int64_t key) const {
auto it = std::find(rows_.begin(), rows_.end(), key);
if (it == rows_.end()) {
PADDLE_THROW(platform::errors::NotFound(
"Input id (%lld) is not in current rows table.", key));
}
return static_cast<int64_t>(std::distance(rows_.begin(), it));
}
/*
* @brief whether has the specified key in the table.
*
* @return true if the key is exists.
*/
bool HasKey(int64_t key) const;
/*
* @brief Get value by the key list.
* Note!!! this interface is only used when selected_rows is used as
* parameters
* for distribute lookup table.
*
* @return a list of pair which contains the non-exists key and the index in
* the value
*/
void Get(const framework::Tensor& ids, framework::Tensor* value,
bool auto_grown = false, bool is_test = false);
/*
* @brief Get the index of the key from id_to_index_ map. If the key not
* exist,
* add the key into id_to_index_.
*
* Note!!! this interface is only used when selected_rows is used as
* parameters
* for distribute lookup table.
*
* @return index of the key.
*/
int64_t AutoGrownIndex(int64_t key, bool auto_grown, bool is_test = false);
/*
* @brief Get the index of the key from id_to_index_ map.
*/
inline int64_t GetIndexFromId(int64_t key) const {
auto iter = id_to_index_.find(key);
if (iter == id_to_index_.end()) {
return -1;
} else {
return iter->second;
}
}
void SyncIndex();
/*
* @brief Get complete Dims before
*/
DDim GetCompleteDims() const {
std::vector<int64_t> dims = vectorize(value_->dims());
dims[0] = height_;
return make_ddim(dims);
}
private:
// Notice: rows can be duplicate. We can have {0, 4, 7, 0, 5, 7, 9} here.
// SelectedRows are simply concated when adding together. Until a
// SelectedRows add a Tensor, will the duplicate rows be handled.
Vector<int64_t> rows_;
std::unordered_map<int64_t, int64_t>
id_to_index_; // should not be used when rows_ has duplicate member
std::unique_ptr<Tensor> value_{nullptr};
int64_t height_; // height indicates the underline tensor's height
std::unique_ptr<RWLock> rwlock_{nullptr};
};
/*
* Serialize/Desiralize SelectedRows to std::ostream
* You can pass ofstream or ostringstream to serilize to file
* or to a in memory string. GPU tensor will be copied to CPU.
*/
void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows,
void SerializeToStream(std::ostream& os,
const pten::SelectedRows& selected_rows,
const platform::DeviceContext& dev_ctx);
void DeserializeFromStream(std::istream& is, SelectedRows* selected_rows,
void DeserializeFromStream(std::istream& is, pten::SelectedRows* selected_rows,
const platform::DeviceContext& dev_ctx);
void SerializeToStream(std::ostream& os, const SelectedRows& selected_rows);
void SerializeToStream(std::ostream& os,
const pten::SelectedRows& selected_rows);
void DeserializeFromStream(std::istream& os, SelectedRows* selected_rows);
void DeserializeFromStream(std::istream& os, pten::SelectedRows* selected_rows);
} // namespace framework
} // namespace paddle
paddle/fluid/framework/selected_rows_utils_test.cc
浏览文件 @ 2bafd338
......@@ -24,7 +24,7 @@ class SelectedRowsTester : public ::testing::Test {
std::vector<int64_t> rows{0, 4, 7};
int64_t height = 10;
int64_t row_numel = 100;
selected_rows_.reset(new SelectedRows(rows, height));
selected_rows_.reset(new pten::SelectedRows(rows, height));
Tensor* value = selected_rows_->mutable_value();
auto* data = value->mutable_data<float>(
......@@ -36,7 +36,7 @@ class SelectedRowsTester : public ::testing::Test {
protected:
platform::CPUPlace place_;
std::unique_ptr<SelectedRows> selected_rows_{nullptr};
std::unique_ptr<pten::SelectedRows> selected_rows_{nullptr};
};
TEST_F(SelectedRowsTester, height) { ASSERT_EQ(selected_rows_->height(), 10); }
......@@ -50,7 +50,7 @@ TEST_F(SelectedRowsTester, complete_dims) {
}
TEST_F(SelectedRowsTester, SerializeAndDeseralize) {
SelectedRows dst_tensor;
pten::SelectedRows dst_tensor;
platform::CPUDeviceContext cpu_ctx(place_);
std::ostringstream oss;
......@@ -71,7 +71,7 @@ TEST_F(SelectedRowsTester, SerializeAndDeseralize) {
TEST(SelectedRows, SparseTable) {
platform::CPUPlace cpu;
SelectedRows table;
pten::SelectedRows table;
int64_t table_size = 100;
int64_t embedding_width = 8;
......@@ -124,7 +124,7 @@ TEST(SelectedRows, SparseTable) {
}
}
void f1(SelectedRows* table, int table_size) {
void f1(pten::SelectedRows* table, int table_size) {
for (int i = 1000000; i > 0; --i) {
auto id = i % table_size;
int64_t index1 = table->AutoGrownIndex(id, true);
......@@ -135,7 +135,7 @@ void f1(SelectedRows* table, int table_size) {
}
}
void f2(SelectedRows* table, int table_size) {
void f2(pten::SelectedRows* table, int table_size) {
for (int i = 0; i < 1000000; ++i) {
auto id = i % table_size;
int64_t index1 = table->AutoGrownIndex(id, true);
......@@ -146,7 +146,7 @@ void f2(SelectedRows* table, int table_size) {
}
}
void f3(SelectedRows* table, int table_size) {
void f3(pten::SelectedRows* table, int table_size) {
clock_t t1 = clock();
for (int i = 100000; i > 0; --i) {
auto id1 = table->AutoGrownIndex(i % table_size, true);
......@@ -157,7 +157,7 @@ void f3(SelectedRows* table, int table_size) {
std::cout << "f3 run time:" << t2 - t1 << std::endl;
}
void f4(SelectedRows* table, int table_size) {
void f4(pten::SelectedRows* table, int table_size) {
clock_t t1 = clock();
for (int i = 0; i < 100000; ++i) {
auto id1 = table->AutoGrownIndex(i % table_size, true);
......@@ -170,7 +170,7 @@ void f4(SelectedRows* table, int table_size) {
TEST(SelectedRows, MultiThreadAutoIndex) {
platform::CPUPlace cpu;
SelectedRows table;
pten::SelectedRows table;
int64_t table_size = 100000;
int64_t embedding_width = 8;
......
paddle/fluid/framework/var_type.h
浏览文件 @ 2bafd338
......@@ -57,7 +57,7 @@ inline void VisitVarType(const framework::Variable& var, Visitor visitor) {
visitor(var.Get<LoDTensorArray>());
return;
case proto::VarType::SELECTED_ROWS:
visitor(var.Get<SelectedRows>());
visitor(var.Get<pten::SelectedRows>());
return;
case proto::VarType::READER:
visitor(var.Get<ReaderHolder>());
......
paddle/fluid/framework/var_type_traits.h
浏览文件 @ 2bafd338
......@@ -49,6 +49,7 @@
namespace pten {
class DenseTensor;
class SelectedRows;
} // namespace pten
// Users should add forward declarations here
......@@ -76,7 +77,6 @@ class LoDRankTable;
class ScopeBase;
class ReaderHolder;
class Scope;
class SelectedRows;
} // namespace framework
namespace operators {
......@@ -166,7 +166,7 @@ struct VarTypeRegistryImpl {
// Users should add other variable types below.
// Paddle would generate unique Ids for each registered variable types.
using VarTypeRegistry = detail::VarTypeRegistryImpl<
Tensor, SelectedRows, std::vector<Scope *>, LoDRankTable, Strings,
Tensor, pten::SelectedRows, std::vector<Scope *>, LoDRankTable, Strings,
LoDTensorArray, platform::PlaceList, ReaderHolder, String, Scope *,
operators::reader::LoDTensorBlockingQueueHolder, FetchList, FeedList,
operators::reader::OrderedMultiDeviceLoDTensorBlockingQueueHolder,
......@@ -206,7 +206,7 @@ struct VarTypeTrait {
// Users should set some of variable type ids to be what is defined in
// framework.proto below
REG_PROTO_VAR_TYPE_TRAIT(LoDTensor, proto::VarType::LOD_TENSOR);
REG_PROTO_VAR_TYPE_TRAIT(SelectedRows, proto::VarType::SELECTED_ROWS);
REG_PROTO_VAR_TYPE_TRAIT(pten::SelectedRows, proto::VarType::SELECTED_ROWS);
REG_PROTO_VAR_TYPE_TRAIT(std::vector<Scope *>, proto::VarType::STEP_SCOPES);
REG_PROTO_VAR_TYPE_TRAIT(LoDRankTable, proto::VarType::LOD_RANK_TABLE);
REG_PROTO_VAR_TYPE_TRAIT(LoDTensorArray, proto::VarType::LOD_TENSOR_ARRAY);
......
paddle/fluid/framework/var_type_traits_test.cc
浏览文件 @ 2bafd338
......@@ -92,7 +92,7 @@ bool CheckVarId(int proto_id) {
TEST(var_type_traits, check_proto_type_id) {
ASSERT_TRUE(CheckVarId<LoDTensor>(proto::VarType::LOD_TENSOR));
ASSERT_TRUE(CheckVarId<SelectedRows>(proto::VarType::SELECTED_ROWS));
ASSERT_TRUE(CheckVarId<pten::SelectedRows>(proto::VarType::SELECTED_ROWS));
ASSERT_TRUE(CheckVarId<std::vector<Scope *>>(proto::VarType::STEP_SCOPES));
ASSERT_TRUE(CheckVarId<LoDRankTable>(proto::VarType::LOD_RANK_TABLE));
ASSERT_TRUE(CheckVarId<LoDTensorArray>(proto::VarType::LOD_TENSOR_ARRAY));
......
paddle/fluid/framework/variable.h
浏览文件 @ 2bafd338
......@@ -123,8 +123,8 @@ inline pten::TensorInplaceVersion* Variable::InplaceVersionCounter() {
version_counter_ptr =
&GetMutable<framework::Tensor>()->InplaceVersionCounter();
} else if (IsType<framework::SelectedRows>()) {
version_counter_ptr = &GetMutable<framework::SelectedRows>()
} else if (IsType<pten::SelectedRows>()) {
version_counter_ptr = &GetMutable<pten::SelectedRows>()
->mutable_value()
->InplaceVersionCounter();
} else {
......
paddle/fluid/framework/variable_helper.cc
浏览文件 @ 2bafd338
......@@ -31,7 +31,7 @@ void InitializeVariable(Variable *var, proto::VarType::Type var_type) {
if (var_type == proto::VarType::LOD_TENSOR) {
var->GetMutable<LoDTensor>();
} else if (var_type == proto::VarType::SELECTED_ROWS) {
var->GetMutable<SelectedRows>();
var->GetMutable<pten::SelectedRows>();
} else if (var_type == proto::VarType::FEED_MINIBATCH) {
var->GetMutable<FeedList>();
} else if (var_type == proto::VarType::FETCH_LIST) {
......@@ -70,9 +70,9 @@ void CopyVariable(const Variable &src_var, Variable *dst_var) {
auto &src_tensor = src_var.Get<framework::LoDTensor>();
tmp_grad_tensor->set_lod(src_tensor.lod());
framework::TensorCopy(src_tensor, cpu_place, tmp_grad_tensor);
} else if (src_var.IsType<framework::SelectedRows>()) {
auto &src_slr = src_var.Get<framework::SelectedRows>();
auto *tmp_grad_slr = dst_var->GetMutable<framework::SelectedRows>();
} else if (src_var.IsType<pten::SelectedRows>()) {
auto &src_slr = src_var.Get<pten::SelectedRows>();
auto *tmp_grad_slr = dst_var->GetMutable<pten::SelectedRows>();
tmp_grad_slr->set_rows(src_slr.rows());
tmp_grad_slr->set_height(src_slr.height());
auto &src_t = src_slr.value();
......
paddle/fluid/imperative/all_reduce.cc
浏览文件 @ 2bafd338
......@@ -39,8 +39,8 @@ static const platform::Place &GetVarPlace(const framework::Variable &src) {
if (src.IsType<framework::LoDTensor>()) {
return src.Get<framework::LoDTensor>().place();
#if NCCL_VERSION_CODE >= 2212
} else if (src.IsType<framework::SelectedRows>()) {
return src.Get<framework::SelectedRows>().value().place();
} else if (src.IsType<pten::SelectedRows>()) {
return src.Get<pten::SelectedRows>().value().place();
#endif
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -70,8 +70,7 @@ static void AllReduce(const framework::Tensor &src, framework::Tensor *dst,
}
#if NCCL_VERSION_CODE >= 2212
static void AllReduce(const framework::SelectedRows &src,
framework::SelectedRows *dst,
static void AllReduce(const pten::SelectedRows &src, pten::SelectedRows *dst,
const ParallelStrategy &strategy,
const gpuStream_t stream,
const platform::NCCLComm *comm) {
......@@ -191,19 +190,18 @@ void AllReduce(const framework::Variable &src, framework::Variable *dst,
AllReduce(src.Get<framework::LoDTensor>(),
dst->GetMutable<framework::LoDTensor>(), stream, comm);
#if NCCL_VERSION_CODE >= 2212
} else if (src.IsType<framework::SelectedRows>()) {
} else if (src.IsType<pten::SelectedRows>()) {
if (&src != dst) {
if (!dst->IsType<framework::SelectedRows>()) {
if (!dst->IsType<pten::SelectedRows>()) {
dst->Clear();
}
AllReduce(src.Get<framework::SelectedRows>(),
dst->GetMutable<framework::SelectedRows>(), strategy, stream,
comm);
AllReduce(src.Get<pten::SelectedRows>(),
dst->GetMutable<pten::SelectedRows>(), strategy, stream, comm);
} else {
// SelectedRows cannot be allreduce in-place
framework::Variable tmp_dst;
AllReduce(src.Get<framework::SelectedRows>(),
tmp_dst.GetMutable<framework::SelectedRows>(), strategy, stream,
AllReduce(src.Get<pten::SelectedRows>(),
tmp_dst.GetMutable<pten::SelectedRows>(), strategy, stream,
comm);
// stream must synchronize to ensure accuracy of the move operation
platform::GpuStreamSync(stream);
......
paddle/fluid/imperative/dygraph_grad_maker.h
浏览文件 @ 2bafd338
......@@ -365,12 +365,12 @@ class TracedGradOp {
var_wrapper->MutableVar()->CurrentInplaceVersion()) {
return var_wrapper;
} else if (var_wrapper->MutableVar()->IsType<framework::LoDTensor>() ||
var_wrapper->MutableVar()->IsType<framework::SelectedRows>()) {
var_wrapper->MutableVar()->IsType<pten::SelectedRows>()) {
auto* tensor =
var_wrapper->MutableVar()->IsType<framework::LoDTensor>()
? var_wrapper->MutableVar()->GetMutable<framework::LoDTensor>()
: var_wrapper->MutableVar()
->GetMutable<framework::SelectedRows>()
->GetMutable<pten::SelectedRows>()
->mutable_value();
if (!tensor->IsInitialized()) {
return var_wrapper;
......
paddle/fluid/imperative/gloo_context.cc
浏览文件 @ 2bafd338
......@@ -72,18 +72,18 @@ void GLOOParallelContext::AllReduceByStream(const framework::Variable &src,
}
AllReduce(src.Get<framework::LoDTensor>(),
dst->GetMutable<framework::LoDTensor>());
} else if (src.IsType<framework::SelectedRows>()) {
} else if (src.IsType<pten::SelectedRows>()) {
if (&src != dst) {
if (!dst->IsType<framework::SelectedRows>()) {
if (!dst->IsType<pten::SelectedRows>()) {
dst->Clear();
}
AllReduce(src.Get<framework::SelectedRows>(),
dst->GetMutable<framework::SelectedRows>());
AllReduce(src.Get<pten::SelectedRows>(),
dst->GetMutable<pten::SelectedRows>());
} else {
// SelectedRows cannot be allreduce in-place
framework::Variable tmp_dst;
AllReduce(src.Get<framework::SelectedRows>(),
tmp_dst.GetMutable<framework::SelectedRows>());
AllReduce(src.Get<pten::SelectedRows>(),
tmp_dst.GetMutable<pten::SelectedRows>());
*dst = std::move(tmp_dst);
}
} else {
......@@ -120,8 +120,8 @@ void GLOOParallelContext::AllReduce(const framework::Tensor &src_tensor,
break; \
}
void GLOOParallelContext::AllReduce(const framework::SelectedRows &src,
framework::SelectedRows *dst) {
void GLOOParallelContext::AllReduce(const pten::SelectedRows &src,
pten::SelectedRows *dst) {
// auto ;
// int local_rank = strategy_.local_rank_;
int nranks = strategy_.nranks_;
......
paddle/fluid/imperative/gloo_context.h
浏览文件 @ 2bafd338
......@@ -59,8 +59,7 @@ class GLOOParallelContext : public ParallelContext {
private:
void AllReduce(const framework::Tensor& src, framework::Tensor* dst);
void AllReduce(const framework::SelectedRows& src,
framework::SelectedRows* dst);
void AllReduce(const pten::SelectedRows& src, pten::SelectedRows* dst);
private:
std::unique_ptr<platform::CPUDeviceContext> device_;
......
paddle/fluid/imperative/gradient_accumulator.cc
浏览文件 @ 2bafd338
......@@ -55,12 +55,12 @@ static void MoveOrCopyVar(framework::Variable* dst, framework::Variable* src,
auto* dst_tensor = dst->GetMutable<framework::LoDTensor>();
framework::TensorCopy(src_tensor, src_tensor.place(), dst_tensor);
dst_tensor->set_lod(src_tensor.lod());
} else if (src->IsType<framework::SelectedRows>()) {
auto& src_selected_rows = src->Get<framework::SelectedRows>();
if (!dst->IsType<framework::SelectedRows>()) {
} else if (src->IsType<pten::SelectedRows>()) {
auto& src_selected_rows = src->Get<pten::SelectedRows>();
if (!dst->IsType<pten::SelectedRows>()) {
dst->Clear();
}
auto* dst_selected_rows = dst->GetMutable<framework::SelectedRows>();
auto* dst_selected_rows = dst->GetMutable<pten::SelectedRows>();
framework::TensorCopy(src_selected_rows.value(),
src_selected_rows.value().place(),
dst_selected_rows->mutable_value());
......@@ -332,7 +332,7 @@ void TensorAdd(const framework::Variable& src, framework::Variable* dst) {
void SelectedRowsAddToTensor(const framework::Variable& src,
framework::Variable* dst) {
auto* dst_tensor = dst->GetMutable<framework::LoDTensor>();
auto& src_selected_rows = src.Get<framework::SelectedRows>();
auto& src_selected_rows = src.Get<pten::SelectedRows>();
auto place = dst_tensor->place();
auto data_type = src_selected_rows.value().type();
platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
......@@ -371,7 +371,7 @@ static void SelectedRowsAddTensor(
const framework::Variable& src_tensor_var,
framework::Variable* dst_tensor_var) {
const auto& src_selected_rows =
src_selected_rows_var.Get<framework::SelectedRows>();
src_selected_rows_var.Get<pten::SelectedRows>();
const auto& src_tensor = src_tensor_var.Get<framework::LoDTensor>();
const auto& place = src_tensor.place();
auto data_type = src_tensor.type();
......@@ -414,18 +414,18 @@ static void SelectedRowsAddTensor(
// to one then add it to a empty selected rows, the after is correct
std::shared_ptr<VariableWrapper> SelectedRowsMerge(
const framework::Variable& src1, const framework::Variable& src2) {
auto& src_selected_rows1 = src1.Get<framework::SelectedRows>();
auto& src_selected_rows2 = src2.Get<framework::SelectedRows>();
auto& src_selected_rows1 = src1.Get<pten::SelectedRows>();
auto& src_selected_rows2 = src2.Get<pten::SelectedRows>();
auto place = src_selected_rows1.value().place();
auto data_type = src_selected_rows1.value().type();
platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
std::vector<const framework::SelectedRows*> src_selected_rows;
std::vector<const pten::SelectedRows*> src_selected_rows;
src_selected_rows.emplace_back(&src_selected_rows1);
src_selected_rows.emplace_back(&src_selected_rows2);
auto dst_var = std::make_shared<VariableWrapper>("Temp");
auto* dst_selected_rows =
dst_var->MutableVar()->GetMutable<framework::SelectedRows>();
dst_var->MutableVar()->GetMutable<pten::SelectedRows>();
#define PADDLE_SELECTED_ROWS_ADD(dev_ctx_type, cpp_type) \
if (data_type == framework::DataTypeTrait<cpp_type>::DataType()) { \
......@@ -463,7 +463,7 @@ void VariableWrapperAdd(std::shared_ptr<VariableWrapper> var,
if (dst->IsType<framework::LoDTensor>()) {
if (src.IsType<framework::LoDTensor>()) {
TensorAdd(src, dst);
} else if (src.IsType<framework::SelectedRows>()) {
} else if (src.IsType<pten::SelectedRows>()) {
SelectedRowsAddToTensor(src, dst);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -481,7 +481,7 @@ void VariableWrapperAdd(std::shared_ptr<VariableWrapper> var,
SelectedRowsAddToTensor(*dst, src_mutable);
*dst = std::move(*(var->MutableVar()));
}
} else if (src.IsType<framework::SelectedRows>()) {
} else if (src.IsType<pten::SelectedRows>()) {
auto temp = SelectedRowsMerge(src, *dst);
*dst = std::move(*(temp->MutableVar()));
} else {
......@@ -497,8 +497,8 @@ static platform::Place GetPlaceOfVar(
platform::Place place;
if (var->Var().IsType<framework::LoDTensor>()) {
place = var->Var().Get<framework::LoDTensor>().place();
} else if (var->Var().IsType<framework::SelectedRows>()) {
place = var->Var().Get<framework::SelectedRows>().place();
} else if (var->Var().IsType<pten::SelectedRows>()) {
place = var->Var().Get<pten::SelectedRows>().place();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"only support LoDTensor and SelectedRows in dygraph"));
......@@ -530,14 +530,14 @@ void GradientAccumulator::AccumulateGrad() {
if (dst->IsType<framework::LoDTensor>()) {
if (src->IsType<framework::LoDTensor>()) {
TensorAdd(*src, dst);
} else if (src->IsType<framework::SelectedRows>()) {
} else if (src->IsType<pten::SelectedRows>()) {
SelectedRowsAddToTensor(*src, dst);
}
} else if (dst->IsType<framework::SelectedRows>()) {
} else if (dst->IsType<pten::SelectedRows>()) {
if (src->IsType<framework::LoDTensor>()) {
SelectedRowsAddToTensor(*dst, src);
*dst = std::move(*src);
} else if (src->IsType<framework::SelectedRows>()) {
} else if (src->IsType<pten::SelectedRows>()) {
auto temp = SelectedRowsMerge(*src, *dst);
*dst = std::move(*(temp->MutableVar()));
}
......@@ -657,7 +657,7 @@ void EagerGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
// so synchronous VariableWrapper with Variable.
if (dst_var->Var().IsType<framework::LoDTensor>()) {
dst_var->SetType(framework::proto::VarType::LOD_TENSOR);
} else if (dst_var->Var().IsType<framework::SelectedRows>()) {
} else if (dst_var->Var().IsType<pten::SelectedRows>()) {
dst_var->SetType(framework::proto::VarType::SELECTED_ROWS);
}
......@@ -701,7 +701,7 @@ void SortedGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
if (paddle::platform::is_gpu_place(place)) {
// sum selected rows firstly
for (auto& var_info : tmp_grad_vars_) {
if (!var_info.var->Var().IsType<framework::SelectedRows>()) {
if (!var_info.var->Var().IsType<pten::SelectedRows>()) {
continue;
}
......@@ -744,7 +744,7 @@ void SortedGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
}
PADDLE_ENFORCE_EQ(
var_info.var->Var().IsType<framework::LoDTensor>() ||
var_info.var->Var().IsType<framework::SelectedRows>(),
var_info.var->Var().IsType<pten::SelectedRows>(),
true, platform::errors::PermissionDenied("The type of Gradient "
"var must be LoDTensor "
"or SelectedRows"));
......@@ -789,7 +789,7 @@ void SortedGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
if (dst_var->Var().IsType<framework::LoDTensor>()) {
dst_var->SetType(framework::proto::VarType::LOD_TENSOR);
} else if (dst_var->Var().IsType<framework::SelectedRows>()) {
} else if (dst_var->Var().IsType<pten::SelectedRows>()) {
dst_var->SetType(framework::proto::VarType::SELECTED_ROWS);
}
}
......
paddle/fluid/imperative/gradient_accumulator.h
浏览文件 @ 2bafd338
......@@ -31,7 +31,7 @@ class GradientAccumulator {
if (var && var->Var().IsInitialized()) {
if (var->Var().IsType<framework::LoDTensor>()) {
var->SetType(framework::proto::VarType::LOD_TENSOR);
} else if (var->Var().IsType<framework::SelectedRows>()) {
} else if (var->Var().IsType<pten::SelectedRows>()) {
var->SetType(framework::proto::VarType::SELECTED_ROWS);
} else {
PADDLE_THROW(platform::errors::PermissionDenied(
......
paddle/fluid/imperative/infer_shape_context.h
浏览文件 @ 2bafd338
......@@ -196,8 +196,8 @@ class DygraphInferShapeContext : public framework::InferShapeContext {
auto* out_lod_tensor = out_var->GetMutable<framework::LoDTensor>();
out_lod_tensor->Resize(in_lod_tensor.dims());
} else {
auto& in_sele_rows = in_var->Get<framework::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<framework::SelectedRows>();
auto& in_sele_rows = in_var->Get<pten::SelectedRows>();
auto out_sele_rows = out_var->GetMutable<pten::SelectedRows>();
out_sele_rows->mutable_value()->Resize(in_sele_rows.value().dims());
out_sele_rows->set_rows(in_sele_rows.rows());
out_sele_rows->set_height(in_sele_rows.height());
......@@ -365,8 +365,8 @@ class DygraphInferShapeContext : public framework::InferShapeContext {
"Input variable should not be null"));
if (var->IsType<framework::LoDTensor>()) {
return var->Get<framework::LoDTensor>().dims();
} else if (var->IsType<framework::SelectedRows>()) {
return var->Get<framework::SelectedRows>().GetCompleteDims();
} else if (var->IsType<pten::SelectedRows>()) {
return var->Get<pten::SelectedRows>().GetCompleteDims();
} else {
PADDLE_THROW(platform::errors::PermissionDenied(
"Only LoDTensor/SelectedRows support 'GetDim', but Variables "
......@@ -382,8 +382,8 @@ class DygraphInferShapeContext : public framework::InferShapeContext {
void SetDim(framework::Variable* var, const DDim& dim) {
if (var->IsType<framework::LoDTensor>()) {
var->GetMutable<framework::LoDTensor>()->Resize(dim);
} else if (var->IsType<framework::SelectedRows>()) {
var->GetMutable<framework::SelectedRows>()->set_height(dim[0]);
} else if (var->IsType<pten::SelectedRows>()) {
var->GetMutable<pten::SelectedRows>()->set_height(dim[0]);
} else {
PADDLE_THROW(platform::errors::PermissionDenied(
"Variable type_id %s, expect LoDTensor/SelectedRows."));
......
paddle/fluid/imperative/layer.cc
浏览文件 @ 2bafd338
......@@ -105,9 +105,9 @@ static std::string DebugString(
ss << "NOT_INITED";
}
ss << ">";
} else if (var.IsType<framework::SelectedRows>()) {
} else if (var.IsType<pten::SelectedRows>()) {
ss << "SelectedRows<";
auto& selected_rows = var.Get<framework::SelectedRows>();
auto& selected_rows = var.Get<pten::SelectedRows>();
auto& tensor = selected_rows.value();
auto& rows = selected_rows.rows();
if (tensor.IsInitialized()) {
......@@ -188,9 +188,8 @@ size_t VarBase::GradOpNum() const {
void VarBase::ClearGradient(bool set_to_zero) {
VLOG(4) << "ClearGradient " << Name();
if (grad_var_) {
if (grad_var_->Var().IsType<framework::SelectedRows>()) {
auto* grad_t =
grad_var_->MutableVar()->GetMutable<framework::SelectedRows>();
if (grad_var_->Var().IsType<pten::SelectedRows>()) {
auto* grad_t = grad_var_->MutableVar()->GetMutable<pten::SelectedRows>();
if (grad_t->mutable_value()->IsInitialized()) {
#ifdef PADDLE_WITH_MKLDNN
if (FLAGS_use_mkldnn) platform::ClearMKLDNNCache(grad_t->place());
......@@ -248,7 +247,7 @@ std::shared_ptr<VarBase> VarBase::NewVarBase(const platform::Place& dst_place,
const bool blocking) const {
PADDLE_ENFORCE_EQ(
Var().IsInitialized() && (Var().IsType<framework::LoDTensor>() ||
Var().IsType<framework::SelectedRows>()),
Var().IsType<pten::SelectedRows>()),
true, platform::errors::InvalidArgument(
"Variable is not initialized or Variable's type is not "
"LoDTensor or SelectedRows when getting numpy tensor"));
......@@ -277,12 +276,12 @@ std::shared_ptr<VarBase> VarBase::NewVarBase(const platform::Place& dst_place,
<< dst_place;
return new_var;
} else {
auto& src_selected_rows = Var().Get<framework::SelectedRows>();
auto& src_selected_rows = Var().Get<pten::SelectedRows>();
auto new_var = std::make_shared<VarBase>(
false, "Itmp" + std::to_string(copied_counter_++));
new_var->SetType(framework::proto::VarType::SELECTED_ROWS);
auto* dst_selected_rows =
new_var->MutableVar()->GetMutable<framework::SelectedRows>();
new_var->MutableVar()->GetMutable<pten::SelectedRows>();
framework::TensorCopy(src_selected_rows.value(), dst_place,
dst_selected_rows->mutable_value());
......@@ -346,10 +345,9 @@ void VarBase::CopyFrom(const VarBase& src, const bool blocking) {
dst_tensor->Resize(src_tensor.dims());
}
framework::TensorCopy(src_tensor, place, dst_tensor);
} else if (src.Var().IsType<framework::SelectedRows>()) {
auto& src_selected_rows = src.Var().Get<framework::SelectedRows>();
auto* dst_selected_rows =
MutableVar()->GetMutable<framework::SelectedRows>();
} else if (src.Var().IsType<pten::SelectedRows>()) {
auto& src_selected_rows = src.Var().Get<pten::SelectedRows>();
auto* dst_selected_rows = MutableVar()->GetMutable<pten::SelectedRows>();
dst_selected_rows->set_height(src_selected_rows.height());
dst_selected_rows->set_rows(src_selected_rows.rows());
......
paddle/fluid/imperative/prepared_operator.cc
浏览文件 @ 2bafd338
......@@ -47,8 +47,8 @@ const std::shared_ptr<VariableWrapper>& GetVariableWrapper(
const framework::Tensor* GetTensorFromVar(const framework::Variable& var) {
if (var.IsType<framework::LoDTensor>()) {
return &(var.Get<framework::LoDTensor>());
} else if (var.IsType<framework::SelectedRows>()) {
return &(var.Get<framework::SelectedRows>().value());
} else if (var.IsType<pten::SelectedRows>()) {
return &(var.Get<pten::SelectedRows>().value());
} else {
return nullptr;
}
......
paddle/fluid/imperative/reducer.cc
浏览文件 @ 2bafd338
......@@ -36,8 +36,7 @@ namespace imperative {
void Group::DivNRanks(const platform::DeviceContext &context, int64_t nranks) {
framework::Tensor *tensor =
is_sparse_
? sparse_contents_->GetMutable<framework::SelectedRows>()
->mutable_value()
? sparse_contents_->GetMutable<pten::SelectedRows>()->mutable_value()
: dense_contents_.GetMutable<framework::LoDTensor>();
if (platform::is_gpu_place(tensor->place())) {
......@@ -775,7 +774,7 @@ void Reducer::MarkVarReady(const size_t var_index, const bool is_used_var) {
auto var_base = vars_[var_index]->GradVarBase();
// need to check tensor type
PADDLE_ENFORCE_EQ(
var_base->Var().IsType<framework::SelectedRows>(), true,
var_base->Var().IsType<pten::SelectedRows>(), true,
platform::errors::PreconditionNotMet(
"The sparse parameter[%d][%s] must have a selectedrows gradient. "
"Before forward pass, the parameter type is inferred to be "
......@@ -995,8 +994,8 @@ bool Reducer::HasGrad(size_t var_index) {
if (var.Get<framework::LoDTensor>().IsInitialized()) {
return true;
}
} else if (var.IsType<framework::SelectedRows>()) {
if (var.Get<framework::SelectedRows>().value().IsInitialized()) {
} else if (var.IsType<pten::SelectedRows>()) {
if (var.Get<pten::SelectedRows>().value().IsInitialized()) {
return true;
}
} else {
......
paddle/fluid/imperative/tests/test_gradient_accmulator.cc
浏览文件 @ 2bafd338
......@@ -124,8 +124,8 @@ static void CopyVar(const framework::Variable& var,
auto* dst_tensor = dst.GetMutable<framework::LoDTensor>();
framework::TensorCopySync(src_tensor, src_tensor.place(), dst_tensor);
} else {
const auto& src_selected_rows = var.Get<framework::SelectedRows>();
auto* dst_selected_rows = dst.GetMutable<framework::SelectedRows>();
const auto& src_selected_rows = var.Get<pten::SelectedRows>();
auto* dst_selected_rows = dst.GetMutable<pten::SelectedRows>();
dst_selected_rows->set_rows(src_selected_rows.rows());
dst_selected_rows->set_height(src_selected_rows.height());
framework::TensorCopySync(src_selected_rows.value(),
......@@ -148,8 +148,8 @@ static bool IsEqualVar(const framework::Variable& var1,
framework::TensorCopySync(var2.Get<framework::LoDTensor>(),
platform::CPUPlace(), &t2);
} else {
auto& s1 = var1.Get<framework::SelectedRows>();
auto& s2 = var2.Get<framework::SelectedRows>();
auto& s1 = var1.Get<pten::SelectedRows>();
auto& s2 = var2.Get<pten::SelectedRows>();
if (s1.height() != s2.height()) {
return false;
......@@ -166,9 +166,9 @@ static bool IsEqualVar(const framework::Variable& var1,
return false;
}
framework::TensorCopySync(var1.Get<framework::SelectedRows>().value(),
framework::TensorCopySync(var1.Get<pten::SelectedRows>().value(),
platform::CPUPlace(), &t1);
framework::TensorCopySync(var2.Get<framework::SelectedRows>().value(),
framework::TensorCopySync(var2.Get<pten::SelectedRows>().value(),
platform::CPUPlace(), &t2);
}
......@@ -211,7 +211,7 @@ static framework::Variable RandomSelectedRows(framework::DDim dims,
dims[0] = row_number;
framework::Variable ret;
auto* sr = ret.GetMutable<framework::SelectedRows>();
auto* sr = ret.GetMutable<pten::SelectedRows>();
auto tensor_var = RandomTensor<T>(dims, place, low, high);
sr->mutable_value()->ShareDataWith(
tensor_var.template Get<framework::LoDTensor>());
......
paddle/fluid/imperative/tests/test_layer.cc
浏览文件 @ 2bafd338
......@@ -237,7 +237,7 @@ TEST(test_layer, test_debug_string) {
std::shared_ptr<imperative::VarBase> selected_rows(
new imperative::VarBase(false, "selected_rows"));
auto tensor_sr = selected_rows->MutableVar()
->GetMutable<framework::SelectedRows>()
->GetMutable<pten::SelectedRows>()
->mutable_value();
std::string res_ui_sr = test_func(selected_rows);
ASSERT_TRUE(res_ui_sr.find("NOT_INITED") != std::string::npos);
......
paddle/fluid/imperative/tests/test_prepare_op.cc
浏览文件 @ 2bafd338
......@@ -101,7 +101,7 @@ const framework::Tensor* GetTensorFromVar(const framework::Variable& var);
TEST(test_prepare_op, test_get_tensor_from_var) {
std::shared_ptr<imperative::VarBase> vout_error(
new imperative::VarBase(false, "vout_error"));
vout_error->MutableVar()->GetMutable<framework::SelectedRows>();
vout_error->MutableVar()->GetMutable<pten::SelectedRows>();
auto* ts = GetTensorFromVar(*vout_error->MutableVar());
ASSERT_TRUE(ts != nullptr);
}
......
paddle/fluid/imperative/variable_wrapper.h
浏览文件 @ 2bafd338
......@@ -104,8 +104,8 @@ class VariableWrapper {
const framework::Tensor* tensor = nullptr;
if (var_.IsType<framework::LoDTensor>()) {
tensor = &(var_.Get<framework::LoDTensor>());
} else if (var_.IsType<framework::SelectedRows>()) {
tensor = &(var_.Get<framework::SelectedRows>().value());
} else if (var_.IsType<pten::SelectedRows>()) {
tensor = &(var_.Get<pten::SelectedRows>().value());
} else {
PADDLE_THROW(platform::errors::PermissionDenied(
"Only support LoDTensor and SelectedRows for gradient var"));
......@@ -153,7 +153,7 @@ class VariableWrapper {
if (type_ == framework::proto::VarType::LOD_TENSOR) {
tensor = &(var_.Get<framework::LoDTensor>());
} else if (type_ == framework::proto::VarType::SELECTED_ROWS) {
tensor = &(var_.Get<framework::SelectedRows>().value());
tensor = &(var_.Get<pten::SelectedRows>().value());
} else if (type_ == framework::proto::VarType::VOCAB) {
const framework::Vocab* data = nullptr;
data = &(var_.Get<framework::Vocab>());
......@@ -193,7 +193,7 @@ class VariableWrapper {
if (type_ == framework::proto::VarType::LOD_TENSOR) {
tensor = &(var_.Get<framework::LoDTensor>());
} else if (type_ == framework::proto::VarType::SELECTED_ROWS) {
tensor = &(var_.Get<framework::SelectedRows>().value());
tensor = &(var_.Get<pten::SelectedRows>().value());
} else {
VLOG(6) << "Variable " << name_ << " is not initialized";
return place;
......
paddle/fluid/inference/api/details/reset_tensor_array.h
浏览文件 @ 2bafd338
......@@ -43,7 +43,7 @@ struct TensorArrayBatchCleaner {
constexpr auto kLoDTensorId =
framework::VarTypeTrait<framework::LoDTensor>::kId;
constexpr auto kSelectedRowsId =
framework::VarTypeTrait<framework::SelectedRows>::kId;
framework::VarTypeTrait<pten::SelectedRows>::kId;
constexpr auto kFetchListId =
framework::VarTypeTrait<framework::FetchList>::kId;
valid_types_.insert(kTensorId);
......
paddle/fluid/operators/assign_op.h
浏览文件 @ 2bafd338
......@@ -50,9 +50,8 @@ class AssignFunctor {
}
}
void operator()(const framework::SelectedRows &rows) const {
framework::SelectedRows &out_rows =
*out_->GetMutable<framework::SelectedRows>();
void operator()(const pten::SelectedRows &rows) const {
pten::SelectedRows &out_rows = *out_->GetMutable<pten::SelectedRows>();
out_rows.set_rows(rows.rows());
out_rows.set_height(rows.height());
auto &t = rows.value();
......
paddle/fluid/operators/assign_op_test.cc
浏览文件 @ 2bafd338
......@@ -87,7 +87,7 @@ TEST(AssignOp, AssignSelectedRows) {
std::vector<int64_t> rows{0, 4, 7};
int64_t height = 10;
paddle::framework::SelectedRows input(rows, height);
pten::SelectedRows input(rows, height);
paddle::framework::Tensor* input_tensor = input.mutable_value();
paddle::framework::DDim in_dims = paddle::framework::make_ddim({3, 4});
......@@ -98,7 +98,7 @@ TEST(AssignOp, AssignSelectedRows) {
assign_functor(input);
auto& out_selected_row = output.Get<paddle::framework::SelectedRows>();
auto& out_selected_row = output.Get<pten::SelectedRows>();
const paddle::framework::Vector<int64_t>& out_rows = out_selected_row.rows();
EXPECT_EQ(rows.size(), out_rows.size());
for (size_t i = 0; i < rows.size(); ++i) {
......
paddle/fluid/operators/clip_by_norm_op.cu
浏览文件 @ 2bafd338
......@@ -36,21 +36,22 @@ class ClipByNormKernel<platform::CUDADeviceContext, platform::float16>
output = context.Output<Tensor>("Out");
output->mutable_data<platform::float16>(context.GetPlace());
} else if (in_var->IsType<SelectedRows>()) {
auto* x = context.Input<SelectedRows>("X");
} else if (in_var->IsType<pten::SelectedRows>()) {
auto* x = context.Input<pten::SelectedRows>("X");
// merge ids in selected rows first
math::scatter::MergeAdd<platform::CUDADeviceContext, platform::float16>
merge_func;
SelectedRows* merged_input =
pten::SelectedRows* merged_input =
const_cast<framework::Scope&>(context.scope())
.Var()
->GetMutable<SelectedRows>();
->GetMutable<pten::SelectedRows>();
merge_func(context.template device_context<platform::CUDADeviceContext>(),
*x, merged_input);
input = &(merged_input->value());
SelectedRows* output_selected_rows = context.Output<SelectedRows>("Out");
pten::SelectedRows* output_selected_rows =
context.Output<pten::SelectedRows>("Out");
output_selected_rows->set_rows(merged_input->rows());
output_selected_rows->set_height(merged_input->height());
output = output_selected_rows->mutable_value();
......
paddle/fluid/operators/clip_by_norm_op.h
浏览文件 @ 2bafd338
......@@ -24,7 +24,7 @@ namespace paddle {
namespace operators {
using Tensor = framework::Tensor;
using SelectedRows = framework::SelectedRows;
// using SelectedRows = pten::SelectedRows;
template <typename T, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
using EigenVector = framework::EigenVector<T, MajorType, IndexType>;
......@@ -43,20 +43,21 @@ class ClipByNormKernel : public framework::OpKernel<T> {
output = context.Output<Tensor>("Out");
output->mutable_data<T>(context.GetPlace());
} else if (in_var->IsType<SelectedRows>()) {
auto* x = context.Input<SelectedRows>("X");
} else if (in_var->IsType<pten::SelectedRows>()) {
auto* x = context.Input<pten::SelectedRows>("X");
// merge ids in selected rows first
math::scatter::MergeAdd<DeviceContext, T> merge_func;
SelectedRows* merged_input =
pten::SelectedRows* merged_input =
const_cast<framework::Scope&>(context.scope())
.Var()
->GetMutable<SelectedRows>();
->GetMutable<pten::SelectedRows>();
merge_func(context.template device_context<DeviceContext>(), *x,
merged_input);
input = &(merged_input->value());
SelectedRows* output_selected_rows = context.Output<SelectedRows>("Out");
pten::SelectedRows* output_selected_rows =
context.Output<pten::SelectedRows>("Out");
output_selected_rows->set_rows(merged_input->rows());
output_selected_rows->set_height(merged_input->height());
output = output_selected_rows->mutable_value();
......
paddle/fluid/operators/clip_op.h
浏览文件 @ 2bafd338
......@@ -113,9 +113,9 @@ class ClipKernel : public framework::OpKernel<T> {
trans(context.template device_context<DeviceContext>(), x_data,
x_data + numel, out_data, ClipFunctor<T>(min, max));
}
} else if (x_var->IsType<framework::SelectedRows>()) {
auto* x = context.Input<framework::SelectedRows>("X");
auto* out = context.Output<framework::SelectedRows>("Out");
} else if (x_var->IsType<pten::SelectedRows>()) {
auto* x = context.Input<pten::SelectedRows>("X");
auto* out = context.Output<pten::SelectedRows>("Out");
PADDLE_ENFORCE_NE(x, out, platform::errors::InvalidArgument(
"Inplace clip is not allowed "
"when x is SelectedRows"));
......
paddle/fluid/operators/elementwise/elementwise_mul_op.cu
浏览文件 @ 2bafd338
......@@ -32,7 +32,7 @@ class ElementwiseMulKernel<platform::CUDADeviceContext, T>
ctx.InputName("X")));
const auto& cuda_ctx =
ctx.template device_context<platform::CUDADeviceContext>();
if (x_var->IsType<framework::SelectedRows>()) {
if (x_var->IsType<pten::SelectedRows>()) {
framework::Tensor x_for_selectedrows;
std::vector<const framework::Tensor*> ins;
std::vector<framework::Tensor*> outs;
......
paddle/fluid/operators/elementwise/elementwise_mul_op.h
浏览文件 @ 2bafd338
......@@ -92,20 +92,20 @@ class ElementwiseMulKernel : public framework::OpKernel<T> {
auto* y = ctx.Input<framework::LoDTensor>("Y");
framework::Tensor x, *z;
if (x_var->IsType<framework::SelectedRows>()) {
if (x_var->IsType<pten::SelectedRows>()) {
PADDLE_ENFORCE_EQ(y->dims().size() == 1 && y->dims()[0] == 1, true,
platform::errors::InvalidArgument(
"For elementwise_op, if X is Sparse, Y must be "
"scalar. But reveived the size of Y = %s.",
y->dims().size()));
auto& x_sele = x_var->Get<framework::SelectedRows>();
auto out_sele = ctx.Output<framework::SelectedRows>("Out");
auto& x_sele = x_var->Get<pten::SelectedRows>();
auto out_sele = ctx.Output<pten::SelectedRows>("Out");
x = x_sele.value();
out_sele->set_rows(x_sele.rows());
out_sele->set_height(x_sele.height());
out_sele->mutable_value()->Resize(x_sele.value().dims());
out_sele->mutable_value()->mutable_data(ctx.GetPlace(), x.type());
z = ctx.Output<framework::SelectedRows>("Out")->mutable_value();
z = ctx.Output<pten::SelectedRows>("Out")->mutable_value();
z->mutable_data<T>(ctx.GetPlace());
auto dims_equal = x.dims() == y->dims();
if (dims_equal) {
......
paddle/fluid/operators/elementwise/elementwise_op_function.h
浏览文件 @ 2bafd338
......@@ -84,7 +84,7 @@ int PackTensorsIntoVector(const framework::ExecutionContext &ctx,
auto *x = ctx.Input<framework::LoDTensor>("X");
z = ctx.Output<framework::LoDTensor>("Out");
ins->emplace_back(x);
} else if (x_var->IsType<framework::SelectedRows>()) {
} else if (x_var->IsType<pten::SelectedRows>()) {
PADDLE_ENFORCE_EQ(y->dims().size() == 1 && y->dims()[0] == 1, true,
platform::errors::InvalidArgument(
"For elementwise_op, if X is Sparse, Y must be "
......@@ -96,15 +96,15 @@ int PackTensorsIntoVector(const framework::ExecutionContext &ctx,
"The parameter x_for_selectedrows is excepted to "
"be valid, once input varible X`s class type is "
"SelectedRows.\n"));
auto &x_sele = x_var->Get<framework::SelectedRows>();
auto out_sele = ctx.Output<framework::SelectedRows>("Out");
auto &x_sele = x_var->Get<pten::SelectedRows>();
auto out_sele = ctx.Output<pten::SelectedRows>("Out");
*x_for_selectedrows = x_sele.value();
out_sele->set_rows(x_sele.rows());
out_sele->set_height(x_sele.height());
out_sele->mutable_value()->Resize(x_sele.value().dims());
out_sele->mutable_value()->mutable_data(ctx.GetPlace(),
x_for_selectedrows->type());
z = ctx.Output<framework::SelectedRows>("Out")->mutable_value();
z = ctx.Output<pten::SelectedRows>("Out")->mutable_value();
ins->emplace_back(x_for_selectedrows);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......
paddle/fluid/operators/fill_constant_op.cc
浏览文件 @ 2bafd338
......@@ -117,7 +117,7 @@ class FillConstantOp : public framework::OperatorWithKernel {
const auto& str_value = ctx.Attr<std::string>("str_value");
value = str_value.empty() ? "value" : "str_value";
}
if (!ctx.OutputVar("Out")->IsType<framework::SelectedRows>()) {
if (!ctx.OutputVar("Out")->IsType<pten::SelectedRows>()) {
return framework::KernelSignature("full", {}, {shape, value}, {"Out"});
}
return framework::KernelSignature("fill_constant.unregistered", {}, {}, {});
......
paddle/fluid/operators/fill_constant_op.h
浏览文件 @ 2bafd338
......@@ -92,8 +92,8 @@ class FillConstantKernel : public framework::OpKernel<T> {
if (out_var->IsType<framework::LoDTensor>()) {
tensor = out_var->GetMutable<framework::LoDTensor>();
tensor->Resize(shape);
} else if (out_var->IsType<framework::SelectedRows>()) {
tensor = out_var->GetMutable<framework::SelectedRows>()->mutable_value();
} else if (out_var->IsType<pten::SelectedRows>()) {
tensor = out_var->GetMutable<pten::SelectedRows>()->mutable_value();
tensor->Resize(shape);
} else {
PADDLE_THROW(platform::errors::Unimplemented(
......
paddle/fluid/operators/filter_by_instag_op.h
浏览文件 @ 2bafd338
......@@ -29,7 +29,7 @@
namespace paddle {
namespace operators {
using Tensor = framework::Tensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using LoDTensor = framework::LoDTensor;
template <typename T>
......
paddle/fluid/operators/fused/fused_embedding_seq_pool_op.h
浏览文件 @ 2bafd338
......@@ -30,7 +30,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using DDim = framework::DDim;
constexpr int64_t kNoPadding = -1;
......@@ -200,8 +200,8 @@ class FusedEmbeddingSeqPoolGradKernel : public framework::OpKernel<T> {
DDim table_dim;
if (table_var->IsType<LoDTensor>()) {
table_dim = context.Input<LoDTensor>("W")->dims();
} else if (table_var->IsType<SelectedRows>()) {
auto *table_t = context.Input<SelectedRows>("W");
} else if (table_var->IsType<pten::SelectedRows>()) {
auto *table_t = context.Input<pten::SelectedRows>("W");
table_dim = table_t->value().dims();
} else {
PADDLE_THROW(platform::errors::PermissionDenied(
......@@ -215,7 +215,8 @@ class FusedEmbeddingSeqPoolGradKernel : public framework::OpKernel<T> {
if (is_sparse) {
auto *ids = context.Input<LoDTensor>("Ids");
auto *d_output = context.Input<LoDTensor>(framework::GradVarName("Out"));
auto *d_table = context.Output<SelectedRows>(framework::GradVarName("W"));
auto *d_table =
context.Output<pten::SelectedRows>(framework::GradVarName("W"));
// runtime shape
d_table->set_height(table_dim[0]);
......
paddle/fluid/operators/get_tensor_from_selected_rows_op.cc
浏览文件 @ 2bafd338
......@@ -57,7 +57,7 @@ class GetTensorFromSelectedRowsOp : public framework::OperatorWithKernel {
class GetTensorFromSelectedRowsKernel {
public:
void operator()(const framework::ExecutionContext &ctx) const {
auto *x = ctx.Input<framework::SelectedRows>("X");
auto *x = ctx.Input<pten::SelectedRows>("X");
auto *out = ctx.Output<framework::LoDTensor>("Out");
out->Resize(x->value().dims());
......
paddle/fluid/operators/hierarchical_sigmoid_op.h
浏览文件 @ 2bafd338
......@@ -204,7 +204,7 @@ class HierarchicalSigmoidGradOpKernel : public framework::OpKernel<T> {
"Custom tree must be set for sparse mode!"));
framework::Vector<int64_t> real_rows = PathToRows(*path);
auto* w_grad =
ctx.Output<framework::SelectedRows>(framework::GradVarName("W"));
ctx.Output<pten::SelectedRows>(framework::GradVarName("W"));
w_grad->set_rows(real_rows);
// Build a map of id -> row_index to speed up finding the index of one id
w_grad->set_height(w.dims()[0]);
......
paddle/fluid/operators/isfinite_op.cc
浏览文件 @ 2bafd338
......@@ -55,8 +55,8 @@ class OverflowOp : public framework::OperatorWithKernel {
auto *x_var = ctx.InputVar("X");
if (x_var->IsType<framework::LoDTensor>()) {
dtype = x_var->Get<framework::LoDTensor>().type();
} else if (x_var->IsType<framework::SelectedRows>()) {
dtype = x_var->Get<framework::SelectedRows>().value().type();
} else if (x_var->IsType<pten::SelectedRows>()) {
dtype = x_var->Get<pten::SelectedRows>().value().type();
} else {
PADDLE_ENFORCE_EQ(
true, false,
......
paddle/fluid/operators/isfinite_op.h
浏览文件 @ 2bafd338
......@@ -58,8 +58,8 @@ class OverflowKernel : public framework::OpKernel<T> {
if (x->IsType<framework::LoDTensor>()) {
auto* in = ctx.Input<framework::Tensor>("X");
functor(*in, out);
} else if (x->IsType<framework::SelectedRows>()) {
auto& in = ctx.Input<framework::SelectedRows>("X")->value();
} else if (x->IsType<pten::SelectedRows>()) {
auto& in = ctx.Input<pten::SelectedRows>("X")->value();
functor(in, out);
} else {
PADDLE_ENFORCE_EQ(
......
paddle/fluid/operators/isfinite_v2_op.cc
浏览文件 @ 2bafd338
......@@ -62,8 +62,8 @@ class OverflowV2Op : public framework::OperatorWithKernel {
auto *x_var = ctx.InputVar("X");
if (x_var->IsType<framework::LoDTensor>()) {
dtype = x_var->Get<framework::LoDTensor>().type();
} else if (x_var->IsType<framework::SelectedRows>()) {
dtype = x_var->Get<framework::SelectedRows>().value().type();
} else if (x_var->IsType<pten::SelectedRows>()) {
dtype = x_var->Get<pten::SelectedRows>().value().type();
} else {
PADDLE_THROW(plat::errors::InvalidArgument(
"Cannot find the input data type by all input data"));
......
paddle/fluid/operators/load_op.h
浏览文件 @ 2bafd338
......@@ -50,7 +50,7 @@ class LoadOpKernel : public framework::OpKernel<T> {
if (out_var->IsType<framework::LoDTensor>()) {
LoadLodTensor(fin, place, out_var, ctx);
} else if (out_var->IsType<framework::SelectedRows>()) {
} else if (out_var->IsType<pten::SelectedRows>()) {
LoadSelectedRows(fin, place, out_var);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -105,7 +105,7 @@ class LoadOpKernel : public framework::OpKernel<T> {
void LoadSelectedRows(std::istream &fin, const platform::Place &place,
framework::Variable *var) const {
auto *selectedRows = var->GetMutable<framework::SelectedRows>();
auto *selectedRows = var->GetMutable<pten::SelectedRows>();
// get device context from pool
platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
auto &dev_ctx = *pool.Get(place);
......
paddle/fluid/operators/lookup_table_dequant_op.h
浏览文件 @ 2bafd338
......@@ -29,7 +29,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using DDim = framework::DDim;
template <typename T>
......
paddle/fluid/operators/lookup_table_op.cu
浏览文件 @ 2bafd338
......@@ -151,7 +151,8 @@ class LookupTableGradCUDAKernel : public framework::OpKernel<T> {
auto *ids = context.Input<LoDTensor>("Ids");
auto *table = context.Input<LoDTensor>("W");
auto *d_output = context.Input<LoDTensor>(framework::GradVarName("Out"));
auto *d_table = context.Output<SelectedRows>(framework::GradVarName("W"));
auto *d_table =
context.Output<pten::SelectedRows>(framework::GradVarName("W"));
auto *ids_data = ids->data<int64_t>();
int64_t ids_num = ids->numel();
......
paddle/fluid/operators/lookup_table_op.h
浏览文件 @ 2bafd338
......@@ -28,7 +28,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using DDim = framework::DDim;
constexpr int64_t kNoPadding = -1;
......@@ -82,8 +82,8 @@ class LookupTableKernel : public framework::OpKernel<T> {
}
}
} else if (table_var->IsType<SelectedRows>()) {
const auto &table_t = table_var->Get<SelectedRows>();
} else if (table_var->IsType<pten::SelectedRows>()) {
const auto &table_t = table_var->Get<pten::SelectedRows>();
int64_t row_width = table_t.value().dims()[1];
const auto *table = table_t.value().data<T>();
auto *output = output_t->mutable_data<T>(context.GetPlace());
......@@ -155,8 +155,8 @@ class LookupTableGradKernel : public framework::OpKernel<T> {
DDim table_dim;
if (table_var->IsType<LoDTensor>()) {
table_dim = context.Input<LoDTensor>("W")->dims();
} else if (table_var->IsType<SelectedRows>()) {
auto *table_t = context.Input<SelectedRows>("W");
} else if (table_var->IsType<pten::SelectedRows>()) {
auto *table_t = context.Input<pten::SelectedRows>("W");
table_dim = table_t->value().dims();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -171,7 +171,8 @@ class LookupTableGradKernel : public framework::OpKernel<T> {
if (is_sparse) {
auto *ids = context.Input<LoDTensor>("Ids");
auto *d_output = context.Input<LoDTensor>(framework::GradVarName("Out"));
auto *d_table = context.Output<SelectedRows>(framework::GradVarName("W"));
auto *d_table =
context.Output<pten::SelectedRows>(framework::GradVarName("W"));
auto *ids_data = ids->data<int64_t>();
int64_t ids_num = ids->numel();
......
paddle/fluid/operators/lookup_table_v2_op.cu
浏览文件 @ 2bafd338
......@@ -152,7 +152,8 @@ class LookupTableV2GradCUDAKernel : public framework::OpKernel<T> {
auto *ids = context.Input<LoDTensor>("Ids");
auto *table = context.Input<LoDTensor>("W");
auto *d_output = context.Input<LoDTensor>(framework::GradVarName("Out"));
auto *d_table = context.Output<SelectedRows>(framework::GradVarName("W"));
auto *d_table =
context.Output<pten::SelectedRows>(framework::GradVarName("W"));
auto *ids_data = ids->data<int64_t>();
int64_t ids_num = ids->numel();
......
paddle/fluid/operators/lookup_table_v2_op.h
浏览文件 @ 2bafd338
......@@ -29,7 +29,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using DDim = framework::DDim;
constexpr int64_t kNoPadding = -1;
......@@ -86,8 +86,8 @@ class LookupTableV2Kernel : public framework::OpKernel<T> {
row_width * sizeof(T));
}
}
} else if (table_var->IsType<SelectedRows>()) {
const auto &table_t = table_var->Get<SelectedRows>();
} else if (table_var->IsType<pten::SelectedRows>()) {
const auto &table_t = table_var->Get<pten::SelectedRows>();
int64_t row_width = table_t.value().dims()[1];
const auto *table = table_t.value().data<T>();
auto *output = output_t->mutable_data<T>(context.GetPlace());
......@@ -132,8 +132,8 @@ class LookupTableV2GradKernel : public framework::OpKernel<T> {
DDim table_dim;
if (table_var->IsType<LoDTensor>()) {
table_dim = context.Input<LoDTensor>("W")->dims();
} else if (table_var->IsType<SelectedRows>()) {
auto *table_t = context.Input<SelectedRows>("W");
} else if (table_var->IsType<pten::SelectedRows>()) {
auto *table_t = context.Input<pten::SelectedRows>("W");
table_dim = table_t->value().dims();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -148,7 +148,8 @@ class LookupTableV2GradKernel : public framework::OpKernel<T> {
if (is_sparse) {
auto *ids_t = context.Input<LoDTensor>("Ids");
auto *d_output = context.Input<LoDTensor>(framework::GradVarName("Out"));
auto *d_table = context.Output<SelectedRows>(framework::GradVarName("W"));
auto *d_table =
context.Output<pten::SelectedRows>(framework::GradVarName("W"));
int64_t ids_num = ids_t->numel();
std::vector<int64_t> ids;
......
paddle/fluid/operators/math/matrix_bit_code.cc
浏览文件 @ 2bafd338
......@@ -227,11 +227,11 @@ template <typename T>
struct MatrixBitCodeFunctorMulGradWeightSR
: public boost::static_visitor<void> {
const framework::Tensor &tmat_;
framework::SelectedRows *weight_;
pten::SelectedRows *weight_;
const framework::Tensor &input_;
MatrixBitCodeFunctorMulGradWeightSR(const framework::Tensor &tmat,
framework::SelectedRows *weight,
pten::SelectedRows *weight,
const framework::Tensor &input)
: tmat_(tmat), weight_(weight), input_(input) {}
......@@ -274,7 +274,7 @@ struct MatrixBitCodeFunctorMulGradWeightSR
template <typename T>
void MatrixBitCodeFunctor<T>::MulGradWeight(const framework::Tensor &tmat,
framework::SelectedRows *weight,
pten::SelectedRows *weight,
const framework::Tensor &input) {
MatrixBitCodeFunctorMulGradWeightSR<T> func(tmat, weight, input);
code_table_.apply_visitor(func);
......
paddle/fluid/operators/math/matrix_bit_code.h
浏览文件 @ 2bafd338
......@@ -252,8 +252,7 @@ class MatrixBitCodeFunctor {
/* For SelectedRows Weight, For index(i, j) >= 0:
weight.row(index(i, j)) += tmat(i, j) * input.row(i)
*/
void MulGradWeight(const framework::Tensor& tmat,
framework::SelectedRows* weight,
void MulGradWeight(const framework::Tensor& tmat, pten::SelectedRows* weight,
const framework::Tensor& input);
/* For j < code_length
input.row(i) += tmat(i, j) * weight.row(index(i, j))
......
paddle/fluid/operators/math/selected_rows_functor.cc
浏览文件 @ 2bafd338
......@@ -24,9 +24,9 @@ namespace math {
template <typename T>
struct SelectedRowsAdd<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input1,
const framework::SelectedRows& input2,
framework::SelectedRows* output) {
const pten::SelectedRows& input1,
const pten::SelectedRows& input2,
pten::SelectedRows* output) {
auto in1_height = input1.height();
PADDLE_ENFORCE_EQ(
in1_height, input2.height(),
......@@ -94,7 +94,7 @@ template struct SelectedRowsAdd<platform::CPUDeviceContext, double>;
template <typename T>
struct SelectedRowsAddTensor<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input1,
const pten::SelectedRows& input1,
const framework::Tensor& input2, framework::Tensor* output) {
auto in1_height = input1.height();
auto in2_dims = input2.dims();
......@@ -154,9 +154,8 @@ template struct SelectedRowsAddTensor<platform::CPUDeviceContext, double>;
template <typename T>
struct SelectedRowsAddTo<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input1,
const int64_t input2_offset,
framework::SelectedRows* input2) {
const pten::SelectedRows& input1, const int64_t input2_offset,
pten::SelectedRows* input2) {
auto in1_height = input1.height();
PADDLE_ENFORCE_EQ(
in1_height, input2->height(),
......@@ -198,9 +197,9 @@ template struct SelectedRowsAddTo<platform::CPUDeviceContext, int64_t>;
template <typename T>
struct SelectedRowsSumTo<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const std::vector<framework::SelectedRows*>& input1,
const std::vector<pten::SelectedRows*>& input1,
const std::vector<int64_t>& input2_offsets,
framework::SelectedRows* input2) {
pten::SelectedRows* input2) {
// Ensure all selected rows have the same height
size_t size = 0u;
for (auto iter = input1.begin(); iter != input1.end(); ++iter) {
......@@ -242,8 +241,7 @@ template struct SelectedRowsSumTo<platform::CPUDeviceContext, double>;
template <typename T>
struct SelectedRowsAddToTensor<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input1,
framework::Tensor* input2) {
const pten::SelectedRows& input1, framework::Tensor* input2) {
if (UNLIKELY(input1.rows().size() == 0)) {
LOG(WARNING) << "input selected rows is empty!";
return;
......@@ -313,7 +311,7 @@ typename std::enable_if<std::is_integral<T>::value>::type elementwise_add_to(
template <typename T>
typename std::enable_if<std::is_same<T, platform::bfloat16>::value>::type
add_sparse_inputs(const std::vector<const framework::SelectedRows*>& inputs,
add_sparse_inputs(const std::vector<const pten::SelectedRows*>& inputs,
const std::unordered_map<int64_t, size_t>& rows_to_id,
int64_t input_width,
const platform::CPUDeviceContext& context, T* out_data) {
......@@ -347,7 +345,7 @@ add_sparse_inputs(const std::vector<const framework::SelectedRows*>& inputs,
template <typename T>
typename std::enable_if<!std::is_same<T, platform::bfloat16>::value>::type
add_sparse_inputs(const std::vector<const framework::SelectedRows*>& inputs,
add_sparse_inputs(const std::vector<const pten::SelectedRows*>& inputs,
const std::unordered_map<int64_t, size_t>& rows_to_id,
int64_t input_width,
const platform::CPUDeviceContext& context, T* out_data) {
......@@ -371,32 +369,31 @@ add_sparse_inputs(const std::vector<const framework::SelectedRows*>& inputs,
template <typename T>
struct MergeAdd<platform::CPUDeviceContext, T> {
framework::SelectedRows operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input,
pten::SelectedRows operator()(const platform::CPUDeviceContext& context,
const pten::SelectedRows& input,
const bool sorted_result = false) {
framework::SelectedRows out;
pten::SelectedRows out;
(*this)(context, input, &out, sorted_result);
return out;
}
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output,
const pten::SelectedRows& input, pten::SelectedRows* output,
const bool sorted_result = false) {
std::vector<const framework::SelectedRows*> inputs;
std::vector<const pten::SelectedRows*> inputs;
inputs.push_back(&input);
(*this)(context, inputs, output, sorted_result);
}
void operator()(const platform::CPUDeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output,
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output,
const bool sorted_result = false) {
if (inputs.size() == 0) {
VLOG(3) << "no input! return";
return;
}
const framework::SelectedRows* has_value_input = nullptr;
const pten::SelectedRows* has_value_input = nullptr;
for (auto* in : inputs) {
if (in->rows().size() > 0) {
has_value_input = in;
......@@ -409,7 +406,7 @@ struct MergeAdd<platform::CPUDeviceContext, T> {
}
auto input_width = has_value_input->value().dims()[1];
auto input_height = has_value_input->height();
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> merged_row_set;
size_t row_num = 0;
for (auto* input : inputs) {
......@@ -480,24 +477,23 @@ struct MergeAdd<platform::CPUDeviceContext, T> {
#ifdef PADDLE_WITH_XPU
template <typename T>
struct MergeAdd<platform::XPUDeviceContext, T> {
framework::SelectedRows operator()(const platform::XPUDeviceContext& context,
const framework::SelectedRows& input,
pten::SelectedRows operator()(const platform::XPUDeviceContext& context,
const pten::SelectedRows& input,
const bool sorted_result = false) {
framework::SelectedRows out;
pten::SelectedRows out;
(*this)(context, input, &out, sorted_result);
return out;
}
void operator()(const platform::XPUDeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output,
const pten::SelectedRows& input, pten::SelectedRows* output,
const bool sorted_result = false) {
framework::Vector<int64_t> input_rows(input.rows());
if (input_rows.size() == 0) {
return;
}
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> row_set(input_rows.begin(), input_rows.end());
std::vector<int64_t> merge_rows(row_set.begin(), row_set.end());
auto input_width = input.value().dims()[1];
......@@ -537,14 +533,14 @@ struct MergeAdd<platform::XPUDeviceContext, T> {
}
void operator()(const platform::XPUDeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output,
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output,
const bool sorted_result = false) {
if (inputs.size() == 0) {
VLOG(3) << "no input! return";
return;
}
const framework::SelectedRows* has_value_input = nullptr;
const pten::SelectedRows* has_value_input = nullptr;
for (auto* in : inputs) {
if (in->rows().size() > 0) {
has_value_input = in;
......@@ -557,7 +553,7 @@ struct MergeAdd<platform::XPUDeviceContext, T> {
}
auto input_width = has_value_input->value().dims()[1];
auto input_height = has_value_input->height();
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> merged_row_set;
size_t row_num = 0;
for (auto* input : inputs) {
......@@ -628,29 +624,28 @@ struct MergeAdd<platform::XPUDeviceContext, T> {
#endif
template <typename T>
struct MergeAverage<platform::CPUDeviceContext, T> {
framework::SelectedRows operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input) {
framework::SelectedRows out;
pten::SelectedRows operator()(const platform::CPUDeviceContext& context,
const pten::SelectedRows& input) {
pten::SelectedRows out;
(*this)(context, input, &out);
return out;
}
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output) {
std::vector<const framework::SelectedRows*> inputs;
const pten::SelectedRows& input, pten::SelectedRows* output) {
std::vector<const pten::SelectedRows*> inputs;
inputs.push_back(&input);
(*this)(context, inputs, output);
}
void operator()(const platform::CPUDeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output) {
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output) {
if (inputs.size() == 0) {
VLOG(3) << "no input! return";
return;
}
const framework::SelectedRows* has_value_input = nullptr;
const pten::SelectedRows* has_value_input = nullptr;
for (auto* in : inputs) {
if (in->rows().size() > 0) {
has_value_input = in;
......@@ -663,7 +658,7 @@ struct MergeAverage<platform::CPUDeviceContext, T> {
}
auto input_width = has_value_input->value().dims()[1];
auto input_height = has_value_input->height();
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> merged_row_set;
size_t row_num = 0;
for (auto* input : inputs) {
......@@ -750,7 +745,7 @@ template struct MergeAverage<platform::CPUDeviceContext, double>;
template <typename T>
struct UpdateToTensor<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const ScatterOps& op, const framework::SelectedRows& input1,
const ScatterOps& op, const pten::SelectedRows& input1,
framework::Tensor* input2) {
auto in1_height = input1.height();
auto in2_dims = input2->dims();
......
paddle/fluid/operators/math/selected_rows_functor.cu
浏览文件 @ 2bafd338
......@@ -26,9 +26,9 @@ namespace math {
template <typename T>
struct SelectedRowsAdd<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input1,
const framework::SelectedRows& input2,
framework::SelectedRows* output) {
const pten::SelectedRows& input1,
const pten::SelectedRows& input2,
pten::SelectedRows* output) {
auto in1_height = input1.height();
PADDLE_ENFORCE_EQ(
in1_height, input2.height(),
......@@ -117,7 +117,7 @@ __global__ void SelectedRowsAddTensorKernel(const T* selected_rows,
template <typename T>
struct SelectedRowsAddTensor<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input1,
const pten::SelectedRows& input1,
const framework::Tensor& input2, framework::Tensor* output) {
auto in1_height = input1.height();
auto in2_dims = input2.dims();
......@@ -182,9 +182,8 @@ template struct SelectedRowsAddTensor<platform::CUDADeviceContext,
template <typename T>
struct SelectedRowsAddTo<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input1,
const int64_t input2_offset,
framework::SelectedRows* input2) {
const pten::SelectedRows& input1, const int64_t input2_offset,
pten::SelectedRows* input2) {
auto in1_height = input1.height();
PADDLE_ENFORCE_EQ(
in1_height, input2->height(),
......@@ -250,8 +249,7 @@ __global__ void SelectedRowsAddToTensorKernel(const T* selected_rows,
template <typename T>
struct SelectedRowsAddToTensor<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input1,
framework::Tensor* input2) {
const pten::SelectedRows& input1, framework::Tensor* input2) {
auto in1_height = input1.height();
auto in2_dims = input2->dims();
PADDLE_ENFORCE_EQ(
......@@ -320,24 +318,23 @@ __global__ void MergeAddKernel(const T* input, const int64_t* input_rows,
template <typename T>
struct MergeAdd<platform::CUDADeviceContext, T> {
framework::SelectedRows operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input,
pten::SelectedRows operator()(const platform::CUDADeviceContext& context,
const pten::SelectedRows& input,
const bool sorted_result = false) {
framework::SelectedRows out;
pten::SelectedRows out;
(*this)(context, input, &out);
return out;
}
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output,
const pten::SelectedRows& input, pten::SelectedRows* output,
const bool sorted_result = false) {
framework::Vector<int64_t> input_rows(input.rows());
if (input_rows.size() == 0) {
return;
}
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> row_set(input_rows.begin(), input_rows.end());
std::vector<int64_t> merge_rows_cpu(row_set.begin(), row_set.end());
framework::Vector<int64_t> merge_rows(merge_rows_cpu);
......@@ -368,14 +365,14 @@ struct MergeAdd<platform::CUDADeviceContext, T> {
}
void operator()(const platform::CUDADeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output,
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output,
const bool sorted_result = false) {
if (inputs.size() == 0) {
VLOG(3) << "no input! return";
return;
}
const framework::SelectedRows* has_value_input = nullptr;
const pten::SelectedRows* has_value_input = nullptr;
for (auto* in : inputs) {
if (in->rows().size() > 0) {
has_value_input = in;
......@@ -388,7 +385,7 @@ struct MergeAdd<platform::CUDADeviceContext, T> {
}
auto input_width = has_value_input->value().dims()[1];
auto input_height = has_value_input->height();
framework::SelectedRows& out = *output;
pten::SelectedRows& out = *output;
std::set<int64_t> merged_row_set;
for (auto* input : inputs) {
if (input->rows().size() == 0) {
......@@ -499,7 +496,7 @@ __global__ void UpdateToTensorKernel(const T* selected_rows,
template <typename T>
struct UpdateToTensor<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const ScatterOps& op, const framework::SelectedRows& input1,
const ScatterOps& op, const pten::SelectedRows& input1,
framework::Tensor* input2) {
// NOTE: Use SelectedRowsAddToTensor for better performance
// no additional MergeAdd called.
......
paddle/fluid/operators/math/selected_rows_functor.h
浏览文件 @ 2bafd338
......@@ -35,15 +35,14 @@ namespace math {
template <typename DeviceContext, typename T>
struct SelectedRowsAdd {
void operator()(const DeviceContext& context,
const framework::SelectedRows& input1,
const framework::SelectedRows& input2,
framework::SelectedRows* output);
const pten::SelectedRows& input1,
const pten::SelectedRows& input2, pten::SelectedRows* output);
};
template <typename DeviceContext, typename T>
struct SelectedRowsAddTensor {
void operator()(const DeviceContext& context,
const framework::SelectedRows& input1,
const pten::SelectedRows& input1,
const framework::Tensor& input2, framework::Tensor* output);
};
......@@ -51,17 +50,17 @@ struct SelectedRowsAddTensor {
template <typename DeviceContext, typename T>
struct SelectedRowsAddTo {
void operator()(const DeviceContext& context,
const framework::SelectedRows& input1,
const int64_t input2_offset, framework::SelectedRows* input2);
const pten::SelectedRows& input1, const int64_t input2_offset,
pten::SelectedRows* input2);
};
// input2 = [all input in input1] + input2
template <typename DeviceContext, typename T>
struct SelectedRowsSumTo {
void operator()(const DeviceContext& context,
const std::vector<framework::SelectedRows*>& input1,
const std::vector<pten::SelectedRows*>& input1,
const std::vector<int64_t>& input2_offsets,
framework::SelectedRows* input2);
pten::SelectedRows* input2);
};
// FIXME: The result of SelectedRowsAddToTensor maybe non deterministic,
......@@ -70,8 +69,7 @@ struct SelectedRowsSumTo {
template <typename DeviceContext, typename T>
struct SelectedRowsAddToTensor {
void operator()(const DeviceContext& context,
const framework::SelectedRows& input1,
framework::Tensor* input2);
const pten::SelectedRows& input1, framework::Tensor* input2);
};
namespace scatter {
......@@ -80,29 +78,25 @@ template <typename DeviceContext, typename T>
struct MergeAdd {
// unary functor, merge by adding duplicated rows in
// the input SelectedRows object.
framework::SelectedRows operator()(const DeviceContext& context,
const framework::SelectedRows& input,
pten::SelectedRows operator()(const DeviceContext& context,
const pten::SelectedRows& input,
const bool sorted_result = false);
void operator()(const DeviceContext& context, const pten::SelectedRows& input,
pten::SelectedRows* output, const bool sorted_result = false);
void operator()(const DeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output,
const bool sorted_result = false);
void operator()(const DeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output,
const bool sorted_result = false);
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output, const bool sorted_result = false);
};
template <typename DeviceContext, typename T>
struct MergeAverage {
framework::SelectedRows operator()(const DeviceContext& context,
const framework::SelectedRows& input);
void operator()(const DeviceContext& context,
const framework::SelectedRows& input,
framework::SelectedRows* output);
pten::SelectedRows operator()(const DeviceContext& context,
const pten::SelectedRows& input);
void operator()(const DeviceContext& context, const pten::SelectedRows& input,
pten::SelectedRows* output);
void operator()(const DeviceContext& context,
const std::vector<const framework::SelectedRows*>& inputs,
framework::SelectedRows* output);
const std::vector<const pten::SelectedRows*>& inputs,
pten::SelectedRows* output);
};
enum class ScatterOps { ASSIGN, ADD, SUB, SUBBY, MUL, DIV, DIVBY };
......@@ -111,8 +105,7 @@ enum class ScatterOps { ASSIGN, ADD, SUB, SUBBY, MUL, DIV, DIVBY };
template <typename DeviceContext, typename T>
struct UpdateToTensor {
void operator()(const DeviceContext& context, const ScatterOps& op,
const framework::SelectedRows& input1,
framework::Tensor* input2);
const pten::SelectedRows& input1, framework::Tensor* input2);
};
} // namespace scatter
......
paddle/fluid/operators/math/selected_rows_functor_test.cc
浏览文件 @ 2bafd338
......@@ -27,8 +27,8 @@ TEST(selected_rows_functor, cpu_add) {
int64_t row_numel = 10;
std::vector<int64_t> rows1{0, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -37,8 +37,8 @@ TEST(selected_rows_functor, cpu_add) {
functor(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{0, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -46,8 +46,7 @@ TEST(selected_rows_functor, cpu_add) {
cpu_place);
functor(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
auto* out_value = output->mutable_value();
// simplely concat two SelectedRows
......@@ -130,8 +129,8 @@ TEST(selected_rows_functor, cpu_add_to) {
int64_t row_numel = 10;
std::vector<int64_t> rows1{0, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -140,8 +139,8 @@ TEST(selected_rows_functor, cpu_add_to) {
functor(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{0, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -149,8 +148,7 @@ TEST(selected_rows_functor, cpu_add_to) {
cpu_place);
functor(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
auto* out_value = output->mutable_value();
......@@ -230,8 +228,8 @@ TEST(selected_rows_functor, cpu_merge_average_float) {
int64_t row_numel = 10;
std::vector<int64_t> rows{0, 4, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows{
new paddle::framework::SelectedRows(rows, height)};
std::unique_ptr<pten::SelectedRows> selected_rows{
new pten::SelectedRows(rows, height)};
auto* in_value = selected_rows->mutable_value();
in_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -242,8 +240,7 @@ TEST(selected_rows_functor, cpu_merge_average_float) {
paddle::operators::math::scatter::MergeAverage<
paddle::platform::CPUDeviceContext, float>
merge_average_functor;
paddle::framework::SelectedRows output =
merge_average_functor(ctx, *selected_rows);
pten::SelectedRows output = merge_average_functor(ctx, *selected_rows);
auto out_height = output.height();
EXPECT_EQ(out_height, height);
......@@ -270,8 +267,8 @@ TEST(selected_rows_functor, cpu_merge_add_float) {
int64_t row_numel = 10;
std::vector<int64_t> rows{0, 4, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows{
new paddle::framework::SelectedRows(rows, height)};
std::unique_ptr<pten::SelectedRows> selected_rows{
new pten::SelectedRows(rows, height)};
auto* in_value = selected_rows->mutable_value();
in_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -279,8 +276,7 @@ TEST(selected_rows_functor, cpu_merge_add_float) {
cpu_place);
functor(ctx, in_value, 1.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
paddle::operators::math::scatter::MergeAdd<paddle::platform::CPUDeviceContext,
float>
......@@ -311,8 +307,8 @@ TEST(selected_rows_functor, cpu_merge_add_int) {
int64_t row_numel = 10;
std::vector<int64_t> rows{0, 4, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows{
new paddle::framework::SelectedRows(rows, height)};
std::unique_ptr<pten::SelectedRows> selected_rows{
new pten::SelectedRows(rows, height)};
auto* in_value = selected_rows->mutable_value();
in_value->mutable_data<int>(
paddle::framework::make_ddim(
......@@ -320,8 +316,7 @@ TEST(selected_rows_functor, cpu_merge_add_int) {
cpu_place);
functor(ctx, in_value, 1);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
paddle::operators::math::scatter::MergeAdd<paddle::platform::CPUDeviceContext,
int>
......@@ -354,8 +349,8 @@ TEST(selected_rows_functor, cpu_merge_add_multi) {
int64_t row_numel = 8;
std::vector<int64_t> rows1{5, 2, 5, 3, 5};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -364,8 +359,8 @@ TEST(selected_rows_functor, cpu_merge_add_multi) {
set_const(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{2, 5, 3, 5, 3};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -373,14 +368,13 @@ TEST(selected_rows_functor, cpu_merge_add_multi) {
cpu_place);
set_const(ctx, in2_value, 1.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
paddle::operators::math::scatter::MergeAdd<paddle::platform::CPUDeviceContext,
float>
merge_add_functor;
std::vector<const paddle::framework::SelectedRows*> inputs;
std::vector<const pten::SelectedRows*> inputs;
inputs.push_back(selected_rows1.get());
inputs.push_back(selected_rows2.get());
merge_add_functor(ctx, inputs, output.get());
......@@ -411,8 +405,8 @@ TEST(selected_rows_functor, cpu_merge_add_multi_noduplicated) {
int64_t row_numel = 8;
std::vector<int64_t> rows1{1, 3, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -421,8 +415,8 @@ TEST(selected_rows_functor, cpu_merge_add_multi_noduplicated) {
set_const(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{0, 2, 4, 6, 8};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -430,14 +424,13 @@ TEST(selected_rows_functor, cpu_merge_add_multi_noduplicated) {
cpu_place);
set_const(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
paddle::operators::math::scatter::MergeAdd<paddle::platform::CPUDeviceContext,
float>
merge_add_functor;
std::vector<const paddle::framework::SelectedRows*> inputs;
std::vector<const pten::SelectedRows*> inputs;
inputs.push_back(selected_rows1.get());
inputs.push_back(selected_rows2.get());
merge_add_functor(ctx, inputs, output.get());
......@@ -472,8 +465,8 @@ TEST(selected_rows_functor, cpu_sum_to) {
int64_t height = 10;
int64_t row_numel = 10;
std::vector<int64_t> rows1{0, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -482,8 +475,8 @@ TEST(selected_rows_functor, cpu_sum_to) {
functor(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{0, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -491,8 +484,7 @@ TEST(selected_rows_functor, cpu_sum_to) {
cpu_place);
functor(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
auto* out_value = output->mutable_value();
// simplely concat two SelectedRows
......@@ -501,7 +493,7 @@ TEST(selected_rows_functor, cpu_sum_to) {
paddle::operators::math::SelectedRowsSumTo<paddle::platform::CPUDeviceContext,
float>
sum_to_functor;
sum_to_functor(ctx, std::vector<paddle::framework::SelectedRows*>(
sum_to_functor(ctx, std::vector<pten::SelectedRows*>(
{selected_rows1.get(), selected_rows2.get()}),
std::vector<int64_t>({0, in1_value->numel()}), output.get());
auto out_height = output->height();
......
paddle/fluid/operators/math/selected_rows_functor_test.cu.cc
浏览文件 @ 2bafd338
......@@ -29,8 +29,8 @@ TEST(selected_rows_functor, gpu_add) {
int64_t row_numel = 10;
std::vector<int64_t> rows1{0, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -48,8 +48,8 @@ TEST(selected_rows_functor, gpu_add) {
#endif
std::vector<int64_t> rows2{0, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -57,8 +57,7 @@ TEST(selected_rows_functor, gpu_add) {
gpu_place);
functor(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
auto* out_value = output->mutable_value();
// simply concat two SelectedRows
......@@ -152,8 +151,8 @@ TEST(selected_rows_functor, gpu_add_to) {
int64_t row_numel = 10;
std::vector<int64_t> rows1{0, 4, 7};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -162,8 +161,8 @@ TEST(selected_rows_functor, gpu_add_to) {
functor(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{0, 5, 7, 9};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -171,8 +170,7 @@ TEST(selected_rows_functor, gpu_add_to) {
gpu_place);
functor(ctx, in2_value, 2.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
auto* out_value = output->mutable_value();
......@@ -264,8 +262,8 @@ TEST(selected_rows_functor, gpu_merge_add) {
int64_t row_numel = 8;
std::vector<int64_t> rows1{5, 2, 5, 3, 5};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows1{
new paddle::framework::SelectedRows(rows1, height)};
std::unique_ptr<pten::SelectedRows> selected_rows1{
new pten::SelectedRows(rows1, height)};
auto* in1_value = selected_rows1->mutable_value();
in1_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -274,8 +272,8 @@ TEST(selected_rows_functor, gpu_merge_add) {
set_const(ctx, in1_value, 1.0);
std::vector<int64_t> rows2{2, 5, 3, 5, 3};
std::unique_ptr<paddle::framework::SelectedRows> selected_rows2{
new paddle::framework::SelectedRows(rows2, height)};
std::unique_ptr<pten::SelectedRows> selected_rows2{
new pten::SelectedRows(rows2, height)};
auto* in2_value = selected_rows2->mutable_value();
in2_value->mutable_data<float>(
paddle::framework::make_ddim(
......@@ -283,14 +281,13 @@ TEST(selected_rows_functor, gpu_merge_add) {
gpu_place);
set_const(ctx, in2_value, 1.0);
std::unique_ptr<paddle::framework::SelectedRows> output{
new paddle::framework::SelectedRows()};
std::unique_ptr<pten::SelectedRows> output{new pten::SelectedRows()};
output->set_height(height);
paddle::operators::math::scatter::MergeAdd<
paddle::platform::CUDADeviceContext, float>
merge_add_functor;
std::vector<const paddle::framework::SelectedRows*> inputs;
std::vector<const pten::SelectedRows*> inputs;
inputs.push_back(selected_rows1.get());
inputs.push_back(selected_rows2.get());
merge_add_functor(ctx, inputs, output.get());
......
paddle/fluid/operators/memcpy_d2h_op.h
浏览文件 @ 2bafd338
......@@ -51,7 +51,7 @@ class MemcpyD2HFunctor {
}
}
void operator()(const framework::SelectedRows &rows) const {
void operator()(const pten::SelectedRows &rows) const {
// (JZ-LIANG) to support SelectedRows
PADDLE_THROW(platform::errors::Unimplemented(
"Memcpy for SelectedRows is NOT support yet."));
......
paddle/fluid/operators/memcpy_h2d_op.h
浏览文件 @ 2bafd338
......@@ -59,7 +59,7 @@ class MemcpyH2DFunctor {
out_tensor.set_lod(lod_tensor.lod());
}
void operator()(const framework::SelectedRows &rows) const {
void operator()(const pten::SelectedRows &rows) const {
// (JZ-LIANG) to support SelectedRows
PADDLE_THROW(platform::errors::Unimplemented(
"Memcpy for SelectedRows is NOT support yet."));
......
paddle/fluid/operators/memcpy_op.h
浏览文件 @ 2bafd338
......@@ -75,7 +75,7 @@ class MemcpyFunctor {
out_tensor.set_lod(lod_tensor.lod());
}
void operator()(const framework::SelectedRows &rows) const {
void operator()(const pten::SelectedRows &rows) const {
// (JZ-LIANG) to support SelectedRows
PADDLE_THROW(platform::errors::Unimplemented(
"Memcpy for SelectedRows is NOT support yet."));
......
paddle/fluid/operators/merge_selected_rows_op.h
浏览文件 @ 2bafd338
......@@ -24,8 +24,8 @@ template <typename DeviceContext, typename T>
class MergeSelectedRowsKernel : public framework::OpKernel<T> {
public:
void Compute(const framework::ExecutionContext& context) const override {
auto* x = context.Input<framework::SelectedRows>("X");
auto* out = context.Output<framework::SelectedRows>("Out");
auto* x = context.Input<pten::SelectedRows>("X");
auto* out = context.Output<pten::SelectedRows>("Out");
math::scatter::MergeAdd<DeviceContext, T> merge_func;
merge_func(context.template device_context<DeviceContext>(), *x, out);
......
paddle/fluid/operators/nce_op.h
浏览文件 @ 2bafd338
......@@ -31,7 +31,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using Sampler = math::Sampler;
using DDim = framework::DDim;
......@@ -364,8 +364,8 @@ class NCEGradKernel : public framework::OpKernel<T> {
DDim table_dim;
if (table_var->IsType<LoDTensor>()) {
table_dim = context.Input<LoDTensor>("Weight")->dims();
} else if (table_var->IsType<SelectedRows>()) {
auto *table_t = context.Input<SelectedRows>("Weight");
} else if (table_var->IsType<pten::SelectedRows>()) {
auto *table_t = context.Input<pten::SelectedRows>("Weight");
table_dim = table_t->value().dims();
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -373,7 +373,8 @@ class NCEGradKernel : public framework::OpKernel<T> {
"must be either LoDTensor or SelectedRows"));
}
auto d_w = context.Output<SelectedRows>(framework::GradVarName("Weight"));
auto d_w =
context.Output<pten::SelectedRows>(framework::GradVarName("Weight"));
d_w->set_rows(labels);
d_w->set_height(table_dim[0]);
......
paddle/fluid/operators/optimizers/adagrad_op.cc
浏览文件 @ 2bafd338
......@@ -111,7 +111,7 @@ size_t FindPos(const std::vector<int64_t>& rows, int64_t value) {
template <typename T>
struct SparseAdagradFunctor<platform::CPUDeviceContext, T> {
void operator()(const platform::CPUDeviceContext& context,
const framework::SelectedRows& grad,
const pten::SelectedRows& grad,
const framework::Tensor& learning_rate, T epsilon,
framework::Tensor* moment, framework::Tensor* param) {
// 1. g_m.rows = set(g.rows)
......
paddle/fluid/operators/optimizers/adagrad_op.cu
浏览文件 @ 2bafd338
......@@ -72,7 +72,7 @@ __global__ void SparseAdagradFunctorKernel(const T* grad, const int64_t* rows,
template <typename T>
struct SparseAdagradFunctor<platform::CUDADeviceContext, T> {
void operator()(const platform::CUDADeviceContext& context,
const framework::SelectedRows& grad,
const pten::SelectedRows& grad,
const framework::Tensor& learning_rate, T epsilon,
framework::Tensor* moment, framework::Tensor* param) {
// 1. g_m.rows = set(g.rows)
......
paddle/fluid/operators/optimizers/adagrad_op.h
浏览文件 @ 2bafd338
......@@ -22,16 +22,15 @@ namespace operators {
template <typename DeviceContext, typename T>
struct SparseAdagradFunctor {
void operator()(const DeviceContext &context,
const framework::SelectedRows &grad,
void operator()(const DeviceContext &context, const pten::SelectedRows &grad,
const framework::Tensor &learning_rate, T epsilon,
framework::Tensor *moment, framework::Tensor *param);
};
template <typename DeviceContext, typename T>
framework::SelectedRows SquareSelectedRows(
const DeviceContext &context, const framework::SelectedRows &input) {
framework::SelectedRows out;
pten::SelectedRows SquareSelectedRows(const DeviceContext &context,
const pten::SelectedRows &input) {
pten::SelectedRows out;
out.set_rows(input.rows());
out.set_height(input.height());
out.mutable_value()->mutable_data<T>(input.value().dims(),
......@@ -88,7 +87,7 @@ class AdagradOpKernel : public framework::OpKernel<T> {
param -
lr.broadcast(m_dsize) * grad / (moment_out.sqrt() + epsilon);
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto *param_tensor = ctx.Input<framework::Tensor>("Param");
PADDLE_ENFORCE_EQ(param_tensor, param_out_tensor,
platform::errors::InvalidArgument(
......@@ -101,7 +100,7 @@ class AdagradOpKernel : public framework::OpKernel<T> {
SparseAdagradFunctor<DeviceContext, T> functor;
functor(ctx.template device_context<DeviceContext>(),
*ctx.Input<framework::SelectedRows>("Grad"),
*ctx.Input<pten::SelectedRows>("Grad"),
*ctx.Input<framework::Tensor>("LearningRate"), epsilon,
moment_out_tensor, param_out_tensor);
} else {
......
paddle/fluid/operators/optimizers/adam_op.cu
浏览文件 @ 2bafd338
......@@ -314,8 +314,8 @@ class AdamOpCUDAKernel : public framework::OpKernel<T> {
beta2_pow_out->mutable_data<MPDType>(ctx.GetPlace()));
}
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto* grad = ctx.Input<framework::SelectedRows>("Grad");
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto* grad = ctx.Input<pten::SelectedRows>("Grad");
if (grad->rows().size() == 0) {
VLOG(3) << "grad row size is 0!!";
return;
......@@ -330,8 +330,8 @@ class AdamOpCUDAKernel : public framework::OpKernel<T> {
}
}
framework::SelectedRows tmp_grad_merge;
const framework::SelectedRows* grad_merge_ptr;
pten::SelectedRows tmp_grad_merge;
const pten::SelectedRows* grad_merge_ptr;
if (is_strict_sorted) {
grad_merge_ptr = grad;
} else {
......
paddle/fluid/operators/optimizers/adam_op.h
浏览文件 @ 2bafd338
......@@ -521,8 +521,8 @@ class AdamOpKernel : public framework::OpKernel<T> {
beta2_pow_out->mutable_data<T>(ctx.GetPlace())[0] =
beta2 * beta2_pow->data<T>()[0];
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto* grad = ctx.Input<framework::SelectedRows>("Grad");
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto* grad = ctx.Input<pten::SelectedRows>("Grad");
if (grad->rows().size() == 0) {
VLOG(3) << "grad row size is 0!!";
return;
......@@ -537,8 +537,8 @@ class AdamOpKernel : public framework::OpKernel<T> {
}
}
framework::SelectedRows tmp_grad_merge;
const framework::SelectedRows* grad_merge_ptr;
pten::SelectedRows tmp_grad_merge;
const pten::SelectedRows* grad_merge_ptr;
if (is_strict_sorted) {
grad_merge_ptr = grad;
} else {
......
paddle/fluid/operators/optimizers/adam_op_xpu.cc
浏览文件 @ 2bafd338
......@@ -195,8 +195,8 @@ class AdamOpXPUKernel : public framework::OpKernel<T> {
xpu_wait(dev_ctx.x_context()->xpu_stream);
}
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto* grad = ctx.Input<framework::SelectedRows>("Grad");
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto* grad = ctx.Input<pten::SelectedRows>("Grad");
auto& dev_ctx = ctx.template device_context<DeviceContext>();
if (grad->rows().size() == 0) {
......@@ -213,8 +213,8 @@ class AdamOpXPUKernel : public framework::OpKernel<T> {
}
}
framework::SelectedRows tmp_grad_merge;
const framework::SelectedRows* grad_merge_ptr;
pten::SelectedRows tmp_grad_merge;
const pten::SelectedRows* grad_merge_ptr;
if (is_strict_sorted) {
grad_merge_ptr = grad;
} else {
......
paddle/fluid/operators/optimizers/adamw_op.cu
浏览文件 @ 2bafd338
......@@ -337,8 +337,8 @@ class AdamWOpCUDAKernel : public framework::OpKernel<T> {
beta2_pow_out->mutable_data<MPDType>(ctx.GetPlace()));
}
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto* grad = ctx.Input<framework::SelectedRows>("Grad");
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto* grad = ctx.Input<pten::SelectedRows>("Grad");
if (grad->rows().size() == 0) {
VLOG(3) << "grad row size is 0!!";
return;
......@@ -353,8 +353,8 @@ class AdamWOpCUDAKernel : public framework::OpKernel<T> {
}
}
framework::SelectedRows tmp_grad_merge;
const framework::SelectedRows* grad_merge_ptr;
pten::SelectedRows tmp_grad_merge;
const pten::SelectedRows* grad_merge_ptr;
if (is_strict_sorted) {
grad_merge_ptr = grad;
} else {
......
paddle/fluid/operators/optimizers/ftrl_op.h
浏览文件 @ 2bafd338
......@@ -180,11 +180,11 @@ class FTRLOpKernel : public framework::OpKernel<T> {
}
s_acc_out.device(place) = sq_accum + g * g;
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto grad = ctx.Input<framework::SelectedRows>("Grad");
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto grad = ctx.Input<pten::SelectedRows>("Grad");
framework::SelectedRows tmp_merged_grad;
framework::SelectedRows* merged_grad = &tmp_merged_grad;
pten::SelectedRows tmp_merged_grad;
pten::SelectedRows* merged_grad = &tmp_merged_grad;
math::scatter::MergeAdd<DeviceContext, T> merge_func;
merge_func(ctx.template device_context<DeviceContext>(), *grad,
merged_grad);
......
paddle/fluid/operators/optimizers/lamb_op.h
浏览文件 @ 2bafd338
......@@ -552,7 +552,7 @@ class LambOpKernel : public framework::OpKernel<T> {
trust_ratio_div_ptr, skip_update_flag);
for_range(moment_update_functor);
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
PADDLE_ENFORCE_EQ(IsMultiPrecision, false,
platform::errors::Unimplemented(
"SelectedRows gradient is not supported when "
......@@ -562,7 +562,7 @@ class LambOpKernel : public framework::OpKernel<T> {
platform::errors::Unimplemented(
"SelectedRows gradient is not supported when "
"multi_precision=True."));
auto& grad = GET_DATA_SAFELY(ctx.Input<framework::SelectedRows>("Grad"),
auto& grad = GET_DATA_SAFELY(ctx.Input<pten::SelectedRows>("Grad"),
"Input", "Grad", "Lamb");
if (grad.rows().size() == 0) {
VLOG(3) << "grad row size is 0!!";
......@@ -578,8 +578,8 @@ class LambOpKernel : public framework::OpKernel<T> {
}
}
framework::SelectedRows tmp_grad_merge;
const framework::SelectedRows* grad_merge_ptr;
pten::SelectedRows tmp_grad_merge;
const pten::SelectedRows* grad_merge_ptr;
if (is_strict_sorted) {
grad_merge_ptr = &grad;
} else {
......
paddle/fluid/operators/optimizers/mkldnn/sgd_mkldnn_op.cc
浏览文件 @ 2bafd338
......@@ -48,7 +48,7 @@ class SGDOneDNNKernel : public SGDOpKernel<pplat::CPUDeviceContext, T> {
VLOG(4) << "[ONEDNN]: sgd_dense_param_kernel<T, SelectedRows>";
const auto *learning_rate = ctx.Input<framework::Tensor>("LearningRate");
auto *param_out = ctx.Output<framework::Tensor>("ParamOut");
const auto *grad = ctx.Input<framework::SelectedRows>("Grad");
const auto *grad = ctx.Input<pten::SelectedRows>("Grad");
const auto &grad_value = grad->value();
const auto &grad_rows = grad->rows();
......
paddle/fluid/operators/optimizers/momentum_op.h
浏览文件 @ 2bafd338
......@@ -27,7 +27,7 @@ namespace paddle {
namespace operators {
using framework::Tensor;
using framework::SelectedRows;
using pten::SelectedRows;
struct NoNesterov;
struct UseNesterov;
......@@ -545,9 +545,9 @@ class MomentumOpKernel : public framework::OpKernel<T> {
}
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
// sparse update embedding with selectedrows
auto grad = ctx.Input<framework::SelectedRows>("Grad");
auto grad = ctx.Input<pten::SelectedRows>("Grad");
// sparse update maybe empty.
if (grad->rows().size() == 0) {
......@@ -555,8 +555,8 @@ class MomentumOpKernel : public framework::OpKernel<T> {
return;
}
framework::SelectedRows tmp_merged_grad;
framework::SelectedRows* merged_grad = &tmp_merged_grad;
pten::SelectedRows tmp_merged_grad;
pten::SelectedRows* merged_grad = &tmp_merged_grad;
math::scatter::MergeAdd<DeviceContext, T> merge_func;
merge_func(ctx.template device_context<DeviceContext>(), *grad,
merged_grad);
......
paddle/fluid/operators/optimizers/momentum_op_npu.cc
浏览文件 @ 2bafd338
......@@ -74,7 +74,7 @@ class NPUMomentumOpKernel : public framework::OpKernel<T> {
regularized_grad, mu_tensor},
{*param_out}, {{"use_nesterov", use_nesterov}});
runner.Run(dev_ctx.stream());
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
PADDLE_ENFORCE_EQ(false, true, platform::errors::PermissionDenied(
"Unsupport SparseMomentum"));
} else {
......
paddle/fluid/operators/optimizers/rmsprop_op.h
浏览文件 @ 2bafd338
......@@ -218,10 +218,10 @@ class RmspropOpKernel : public framework::OpKernel<T> {
rho, epsilon, momentum, grad_func));
}
}
} else if (grad_var->IsType<framework::SelectedRows>()) {
auto &grad = grad_var->Get<framework::SelectedRows>();
framework::SelectedRows tmp_merged_grad;
framework::SelectedRows *merged_grad = &tmp_merged_grad;
} else if (grad_var->IsType<pten::SelectedRows>()) {
auto &grad = grad_var->Get<pten::SelectedRows>();
pten::SelectedRows tmp_merged_grad;
pten::SelectedRows *merged_grad = &tmp_merged_grad;
math::scatter::MergeAdd<DeviceContext, T> merge_func;
merge_func(dev_ctx, grad, merged_grad);
......
paddle/fluid/operators/optimizers/sgd_op.cc
浏览文件 @ 2bafd338
......@@ -80,7 +80,7 @@ class SGDOp : public framework::OperatorWithKernel {
// supported cases
bool dense_param_sparse_grad =
param_var->IsType<framework::LoDTensor>() &&
grad_var->IsType<framework::SelectedRows>();
grad_var->IsType<pten::SelectedRows>();
bool dense_param_and_grad = param_var->IsType<framework::LoDTensor>() &&
grad_var->IsType<framework::LoDTensor>();
......
paddle/fluid/operators/optimizers/sgd_op.cu
浏览文件 @ 2bafd338
......@@ -112,7 +112,7 @@ class SGDOpKernel<platform::CUDADeviceContext, T>
param->numel(), param_out->mutable_data<T>(ctx.GetPlace()),
master_in_data, master_out_data);
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
// TODO(qijun): In Sparse SGD operator, in-place update is enforced.
// This manual optimization brings difficulty to track data dependency.
// It's better to find a more elegant solution.
......@@ -121,7 +121,7 @@ class SGDOpKernel<platform::CUDADeviceContext, T>
platform::errors::InvalidArgument(
"The input tensor Param of SgdOp should be equal with ParamOut "
"if variable's type is SelectedRows."));
auto* grad = ctx.Input<framework::SelectedRows>("Grad");
auto* grad = ctx.Input<pten::SelectedRows>("Grad");
auto in_height = grad->height();
auto out_dims = param_out->dims();
......
paddle/fluid/operators/optimizers/sgd_op.h
浏览文件 @ 2bafd338
......@@ -60,13 +60,13 @@ struct sgd_dense_param_kernel<
// SelectedRows
template <typename T>
struct sgd_dense_param_kernel<
T, framework::VarTypeTrait<framework::SelectedRows>::kId> {
T, framework::VarTypeTrait<pten::SelectedRows>::kId> {
void operator()(const framework::ExecutionContext &ctx) const {
VLOG(4) << "[CPU]: sgd_dense_param_kernel<T, SelectedRows>";
const auto *learning_rate = ctx.Input<framework::Tensor>("LearningRate");
const auto *param = ctx.Input<framework::Tensor>("Param");
auto *param_out = ctx.Output<framework::Tensor>("ParamOut");
const auto *grad = ctx.Input<framework::SelectedRows>("Grad");
const auto *grad = ctx.Input<pten::SelectedRows>("Grad");
const auto &grad_value = grad->value();
const auto &grad_rows = grad->rows();
......@@ -114,12 +114,12 @@ struct sgd_dense_param_kernel<
// SelectedRows
template <>
struct sgd_dense_param_kernel<
platform::bfloat16, framework::VarTypeTrait<framework::SelectedRows>::kId> {
platform::bfloat16, framework::VarTypeTrait<pten::SelectedRows>::kId> {
void operator()(const framework::ExecutionContext &ctx) const {
VLOG(4) << "[CPU]: sgd_dense_param_kernel<bfloat16, SelectedRows>";
const auto *learning_rate = ctx.Input<framework::Tensor>("LearningRate");
auto *param_out = ctx.Output<framework::Tensor>("ParamOut");
const auto *grad = ctx.Input<framework::SelectedRows>("Grad");
const auto *grad = ctx.Input<pten::SelectedRows>("Grad");
const auto &grad_value = grad->value();
const auto &grad_rows = grad->rows();
......@@ -163,7 +163,7 @@ class SGDOpKernel<platform::CPUDeviceContext, T>
if (param_var->IsType<framework::LoDTensor>()) {
invoke_dense_param_kernel(ctx);
} else if (param_var->IsType<framework::SelectedRows>()) {
} else if (param_var->IsType<pten::SelectedRows>()) {
sparse_param_and_grad_kernel(ctx);
} else {
PADDLE_ENFORCE_EQ(
......@@ -200,7 +200,7 @@ class SGDOpKernel<platform::CPUDeviceContext, T>
grad->numel(), sz));
dense_param_and_grad_kernel(ctx);
} else if (grad_var->IsType<framework::SelectedRows>()) {
} else if (grad_var->IsType<pten::SelectedRows>()) {
// TODO(qijun): In Sparse SGD operator, in-place update is enforced.
// This manual optimization brings difficulty to track data dependency.
// It's better to find a more elegant solution.
......@@ -209,7 +209,7 @@ class SGDOpKernel<platform::CPUDeviceContext, T>
"The input tensor Param of SgdOp "
"should be equal with ParamOut if variable's "
"type is SelectedRows. "));
const auto *grad = ctx.Input<framework::SelectedRows>("Grad");
const auto *grad = ctx.Input<pten::SelectedRows>("Grad");
// for distributed training, a sparse var may be empty,
// just skip updating.
......@@ -259,13 +259,13 @@ class SGDOpKernel<platform::CPUDeviceContext, T>
const auto *param_var = ctx.InputVar("Param");
const auto *grad_var = ctx.InputVar("Grad");
PADDLE_ENFORCE_EQ(grad_var->IsType<framework::SelectedRows>(), true,
PADDLE_ENFORCE_EQ(grad_var->IsType<pten::SelectedRows>(), true,
platform::errors::InvalidArgument(
"When param is SelectedRows, gradient should also "
"be SelectedRows"));
const auto &param = param_var->Get<framework::SelectedRows>();
auto *param_out = ctx.Output<framework::SelectedRows>("ParamOut");
const auto &grad = grad_var->Get<framework::SelectedRows>();
const auto &param = param_var->Get<pten::SelectedRows>();
auto *param_out = ctx.Output<pten::SelectedRows>("ParamOut");
const auto &grad = grad_var->Get<pten::SelectedRows>();
// for distributed training, a sparse var may be empty,
// just skip updating.
......@@ -309,7 +309,7 @@ class SGDOpKernel<platform::CPUDeviceContext, T>
virtual void dense_param_sparse_grad_kernel(
const framework::ExecutionContext &ctx) const {
detail::sgd_dense_param_kernel<
T, framework::VarTypeTrait<framework::SelectedRows>::kId>()(ctx);
T, framework::VarTypeTrait<pten::SelectedRows>::kId>()(ctx);
}
};
......
paddle/fluid/operators/pscore/distributed_lookup_table_op.h
浏览文件 @ 2bafd338
......@@ -40,8 +40,8 @@ class DistributedLookupTableKernel : public framework::OpKernel<T> {
if (var->IsType<framework::LoDTensor>()) {
emb_dim = var->Get<framework::LoDTensor>().dims()[1];
} else if (var->IsType<framework::SelectedRows>()) {
emb_dim = var->Get<framework::SelectedRows>().value().dims()[1];
} else if (var->IsType<pten::SelectedRows>()) {
emb_dim = var->Get<pten::SelectedRows>().value().dims()[1];
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"Expected type of `W` must be Tensor, SelectedRows.But got "
......
paddle/fluid/operators/pscore/fake_init_op.cc
浏览文件 @ 2bafd338
......@@ -39,8 +39,8 @@ class FakeInitOp : public framework::OperatorBase {
if (out_var.IsType<framework::LoDTensor>()) {
tensor = out_var.GetMutable<framework::LoDTensor>();
tensor->Resize(framework::make_ddim(Attr<std::vector<int64_t>>("shape")));
} else if (out_var.IsType<framework::SelectedRows>()) {
tensor = out_var.GetMutable<framework::SelectedRows>()->mutable_value();
} else if (out_var.IsType<pten::SelectedRows>()) {
tensor = out_var.GetMutable<pten::SelectedRows>()->mutable_value();
tensor->Resize(framework::make_ddim(Attr<std::vector<int64_t>>("shape")));
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......
paddle/fluid/operators/pscore/heter_server_test.cc
浏览文件 @ 2bafd338
......@@ -52,7 +52,7 @@ framework::BlockDesc* AppendSendAndRecvBlock(framework::ProgramDesc* program) {
void CreateVarsOnScope(framework::Scope* scope, platform::CPUPlace* place) {
auto w_var = scope->Var("w");
w_var->GetMutable<framework::SelectedRows>();
w_var->GetMutable<pten::SelectedRows>();
auto out_var = scope->Var("out");
out_var->GetMutable<framework::LoDTensor>();
......@@ -123,7 +123,7 @@ void InitTensorsOnClient2(framework::Scope* scope, platform::CPUPlace* place,
void InitTensorsOnServer(framework::Scope* scope, platform::CPUPlace* place,
int64_t rows_numel) {
CreateVarsOnScope(scope, place);
auto w = scope->Var("w")->GetMutable<framework::SelectedRows>();
auto w = scope->Var("w")->GetMutable<pten::SelectedRows>();
auto w_value = w->mutable_value();
w_value->Resize({rows_numel, 10});
for (int64_t i = 0; i < rows_numel; ++i) w->AutoGrownIndex(i, true);
......
paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc
浏览文件 @ 2bafd338
......@@ -55,7 +55,7 @@ framework::BlockDesc* AppendSendAndRecvBlock(framework::ProgramDesc* program) {
void CreateVarsOnScope(framework::Scope* scope) {
auto w_var = scope->Var("w");
w_var->GetMutable<framework::SelectedRows>();
w_var->GetMutable<pten::SelectedRows>();
auto out_var = scope->Var("out");
out_var->GetMutable<framework::LoDTensor>();
......@@ -76,7 +76,7 @@ void CreateVarsOnScope(framework::Scope* scope) {
void InitTensorsOnServer(framework::Scope* scope, platform::CPUPlace* place,
int64_t rows_numel) {
CreateVarsOnScope(scope);
auto w = scope->Var("w")->GetMutable<framework::SelectedRows>();
auto w = scope->Var("w")->GetMutable<pten::SelectedRows>();
auto w_value = w->mutable_value();
w_value->Resize({rows_numel, 10});
for (int64_t i = 0; i < rows_numel; ++i) w->AutoGrownIndex(i, true);
......
paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc
浏览文件 @ 2bafd338
......@@ -59,7 +59,7 @@ framework::BlockDesc* AppendSendAndRecvBlock(framework::ProgramDesc* program) {
void CreateVarsOnScope(framework::Scope* scope) {
auto w_var = scope->Var("w");
w_var->GetMutable<framework::SelectedRows>();
w_var->GetMutable<pten::SelectedRows>();
auto out_var = scope->Var("out");
out_var->GetMutable<framework::LoDTensor>();
......@@ -121,7 +121,7 @@ void InitTensorsOnClient(framework::Scope* scope, int64_t rows_numel,
void InitTensorsOnServer(framework::Scope* scope, platform::CPUPlace* place,
int64_t rows_numel) {
CreateVarsOnScope(scope);
auto w = scope->Var("w")->GetMutable<framework::SelectedRows>();
auto w = scope->Var("w")->GetMutable<pten::SelectedRows>();
auto w_value = w->mutable_value();
w_value->Resize({rows_numel, 10});
for (int64_t i = 0; i < rows_numel; ++i) w->AutoGrownIndex(i, true);
......
paddle/fluid/operators/run_program_op.h
浏览文件 @ 2bafd338
......@@ -46,7 +46,7 @@ using ProgramDesc = framework::ProgramDesc;
using Variable = framework::Variable;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
namespace details {
......@@ -86,17 +86,17 @@ static void CheckOutputVarStatus(const Variable &src_var,
"RunProgram(Grad)Op's internal "
"scope is not initialized.",
var_name));
} else if (dst_var.IsType<SelectedRows>()) {
} else if (dst_var.IsType<pten::SelectedRows>()) {
PADDLE_ENFORCE_EQ(
src_var.IsType<SelectedRows>(), true,
src_var.IsType<pten::SelectedRows>(), true,
platform::errors::InvalidArgument(
"The output variable %s get from "
"RunProgram(Grad)Op's internal scope holds "
"wrong type. Expect type is SelectedRows, but receive type is %s.",
var_name,
platform::demangle(framework::ToTypeName(src_var.Type()))));
PADDLE_ENFORCE_EQ(src_var.Get<SelectedRows>().value().IsInitialized(), true,
platform::errors::InvalidArgument(
PADDLE_ENFORCE_EQ(src_var.Get<pten::SelectedRows>().value().IsInitialized(),
true, platform::errors::InvalidArgument(
"The tensor in output variable %s get from "
"RunProgram(Grad)Op's "
"internal scope is not initialized.",
......@@ -118,12 +118,12 @@ static void VariableShare(const Variable &src_var, Variable *dst_var) {
auto *lod_tensor = dst_var->GetMutable<LoDTensor>();
lod_tensor->ShareDataWith(src_var.Get<LoDTensor>());
lod_tensor->set_lod(src_var.Get<LoDTensor>().lod());
} else if (src_var.IsType<SelectedRows>()) {
auto *selected_rows = dst_var->GetMutable<SelectedRows>();
} else if (src_var.IsType<pten::SelectedRows>()) {
auto *selected_rows = dst_var->GetMutable<pten::SelectedRows>();
selected_rows->mutable_value()->ShareDataWith(
src_var.Get<SelectedRows>().value());
selected_rows->set_rows(src_var.Get<SelectedRows>().rows());
selected_rows->set_height(src_var.Get<SelectedRows>().height());
src_var.Get<pten::SelectedRows>().value());
selected_rows->set_rows(src_var.Get<pten::SelectedRows>().rows());
selected_rows->set_height(src_var.Get<pten::SelectedRows>().height());
}
}
......
paddle/fluid/operators/save_op.h
浏览文件 @ 2bafd338
......@@ -56,7 +56,7 @@ class SaveOpKernel : public framework::OpKernel<T> {
if (input_var->IsType<framework::LoDTensor>()) {
SaveLodTensor(ctx, place, input_var, filename);
} else if (input_var->IsType<framework::SelectedRows>()) {
} else if (input_var->IsType<pten::SelectedRows>()) {
SaveSelectedRows(ctx, place, input_var, filename);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -105,7 +105,7 @@ class SaveOpKernel : public framework::OpKernel<T> {
const platform::Place &place,
const framework::Variable *var,
const std::string &filename) const {
auto &selectedRows = var->Get<framework::SelectedRows>();
auto &selectedRows = var->Get<pten::SelectedRows>();
// get device context from pool
platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
......
paddle/fluid/operators/scale_op.h
浏览文件 @ 2bafd338
......@@ -55,9 +55,9 @@ class ScaleKernel : public framework::OpKernel<T> {
}
auto* out_var = ctx.OutputVar("Out");
if (in_var->IsType<framework::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<framework::SelectedRows>();
auto* out_slr = out_var->GetMutable<framework::SelectedRows>();
if (in_var->IsType<pten::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<pten::SelectedRows>();
auto* out_slr = out_var->GetMutable<pten::SelectedRows>();
out_slr->set_rows(in_slr.rows());
out_slr->set_height(in_slr.height());
}
......
paddle/fluid/operators/scale_op_mlu.cc
浏览文件 @ 2bafd338
......@@ -57,9 +57,9 @@ class ScaleMLUKernel : public framework::OpKernel<T> {
MLUCnnl::Fill(ctx, bias, bias_desc.get(), GetBasePtr(&bias_tensor));
auto* out_var = ctx.OutputVar("Out");
if (in_var->IsType<framework::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<framework::SelectedRows>();
auto* out_slr = out_var->GetMutable<framework::SelectedRows>();
if (in_var->IsType<pten::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<pten::SelectedRows>();
auto* out_slr = out_var->GetMutable<pten::SelectedRows>();
out_slr->set_rows(in_slr.rows());
out_slr->set_height(in_slr.height());
}
......
paddle/fluid/operators/scale_op_xpu.cc
浏览文件 @ 2bafd338
......@@ -32,9 +32,9 @@ class ScaleXPUKernel : public framework::OpKernel<T> {
auto bias = static_cast<float>(ctx.Attr<float>("bias"));
auto bias_after_scale = ctx.Attr<bool>("bias_after_scale");
auto* out_var = ctx.OutputVar("Out");
if (in_var->IsType<framework::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<framework::SelectedRows>();
auto* out_slr = out_var->GetMutable<framework::SelectedRows>();
if (in_var->IsType<pten::SelectedRows>() && in_var != out_var) {
auto& in_slr = in_var->Get<pten::SelectedRows>();
auto* out_slr = out_var->GetMutable<pten::SelectedRows>();
out_slr->set_rows(in_slr.rows());
out_slr->set_height(in_slr.height());
}
......
paddle/fluid/operators/shape_op.h
浏览文件 @ 2bafd338
......@@ -21,7 +21,7 @@ namespace operators {
using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
template <typename T>
class ShapeKernel : public framework::OpKernel<T> {
......@@ -29,8 +29,8 @@ class ShapeKernel : public framework::OpKernel<T> {
void Compute(const framework::ExecutionContext& ctx) const override {
auto* in_var = ctx.InputVar("Input");
framework::DDim in_dims;
if (in_var->IsType<SelectedRows>()) {
in_dims = in_var->Get<SelectedRows>().value().dims();
if (in_var->IsType<pten::SelectedRows>()) {
in_dims = in_var->Get<pten::SelectedRows>().value().dims();
} else {
in_dims = in_var->Get<LoDTensor>().dims();
}
......
paddle/fluid/operators/shape_op_npu.cc
浏览文件 @ 2bafd338
......@@ -22,7 +22,6 @@ namespace paddle {
namespace operators {
using Tensor = framework::Tensor;
using SelectedRows = framework::SelectedRows;
template <typename DeviceContext, typename T>
class ShapeNPUKernel : public framework::OpKernel<T> {
......@@ -30,8 +29,8 @@ class ShapeNPUKernel : public framework::OpKernel<T> {
void Compute(const framework::ExecutionContext& ctx) const override {
auto* in_var = ctx.InputVar("Input");
framework::DDim in_dims;
if (in_var->IsType<SelectedRows>()) {
in_dims = in_var->Get<SelectedRows>().value().dims();
if (in_var->IsType<pten::SelectedRows>()) {
in_dims = in_var->Get<pten::SelectedRows>().value().dims();
} else {
in_dims = in_var->Get<LoDTensor>().dims();
}
......
paddle/fluid/operators/share_data_op.h
浏览文件 @ 2bafd338
......@@ -29,9 +29,8 @@ class ShareDataKernel : public framework::OpKernel<T> {
auto *detach_tensor = out_var->GetMutable<framework::LoDTensor>();
detach_tensor->ShareDataWith(origin_tensor);
} else {
const auto &origin_selected_rows = in_var->Get<framework::SelectedRows>();
auto *detach_selected_rows =
out_var->GetMutable<framework::SelectedRows>();
const auto &origin_selected_rows = in_var->Get<pten::SelectedRows>();
auto *detach_selected_rows = out_var->GetMutable<pten::SelectedRows>();
detach_selected_rows->mutable_value()->ShareDataWith(
origin_selected_rows.value());
}
......
paddle/fluid/operators/sum_op.cc
浏览文件 @ 2bafd338
......@@ -165,9 +165,9 @@ class SumOp : public framework::OperatorWithKernel {
return framework::OpKernelType(data_type, ctx.GetPlace(), layout,
library);
} else if (x_vars[0]->IsType<framework::SelectedRows>()) {
} else if (x_vars[0]->IsType<pten::SelectedRows>()) {
for (auto& var : x_vars) {
auto& value = var->Get<framework::SelectedRows>().value();
auto& value = var->Get<pten::SelectedRows>().value();
if (value.IsInitialized()) {
return framework::OpKernelType(value.type(), ctx.device_context(),
layout, library);
......
paddle/fluid/operators/sum_op.cu
浏览文件 @ 2bafd338
......@@ -151,7 +151,7 @@ void SumToLoDTensor(const framework::ExecutionContext &context) {
if (lod_length && in_i.IsInitialized()) {
in_data.emplace_back(in_i.data<T>());
}
} else if (in_vars[i]->IsType<framework::SelectedRows>()) {
} else if (in_vars[i]->IsType<pten::SelectedRows>()) {
selectrow_index.push_back(i);
}
}
......@@ -162,7 +162,7 @@ void SumToLoDTensor(const framework::ExecutionContext &context) {
size_t rows = 0;
int64_t length = 0;
for (auto index : selectrow_index) {
auto &sr = in_vars[index]->Get<framework::SelectedRows>();
auto &sr = in_vars[index]->Get<pten::SelectedRows>();
auto &sr_value = sr.value();
auto &sr_rows = sr.rows();
......@@ -235,7 +235,7 @@ class SumKernel<platform::CUDADeviceContext, T>
if (out_var->IsType<framework::LoDTensor>()) {
SumToLoDTensor<T>(context);
} else if (out_var->IsType<framework::SelectedRows>()) {
} else if (out_var->IsType<pten::SelectedRows>()) {
SelectedRowsCompute<platform::CUDADeviceContext, T>(context);
} else if (out_var->IsType<framework::LoDTensorArray>()) {
LodTensorArrayCompute<platform::CUDADeviceContext, T>(context);
......
paddle/fluid/operators/sum_op.h
浏览文件 @ 2bafd338
......@@ -21,7 +21,7 @@ namespace paddle {
namespace operators {
using Tensor = framework::Tensor;
using SelectedRows = framework::SelectedRows;
using SelectedRows = pten::SelectedRows;
using LoDTensor = framework::LoDTensor;
template <typename T, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
......@@ -37,32 +37,32 @@ void SelectedRowsCompute(const framework::ExecutionContext &context) {
return;
}
std::vector<const paddle::framework::SelectedRows *> inputs;
std::vector<const pten::SelectedRows *> inputs;
SelectedRows temp_in0;
if (in_place) {
auto &in0 = in_vars[0]->Get<SelectedRows>();
auto &in0 = in_vars[0]->Get<pten::SelectedRows>();
temp_in0.set_height(in0.height());
temp_in0.set_rows(in0.rows());
framework::TensorCopy(in0.value(), in0.place(), context.device_context(),
temp_in0.mutable_value());
inputs.push_back(&temp_in0);
for (size_t i = 1; i < in_vars.size(); ++i) {
auto &in = in_vars[i]->Get<SelectedRows>();
auto &in = in_vars[i]->Get<pten::SelectedRows>();
if (in.rows().size() > 0) {
inputs.push_back(&in);
}
}
} else {
for (auto &in_var : in_vars) {
auto &in = in_var->Get<SelectedRows>();
auto &in = in_var->Get<pten::SelectedRows>();
if (in.rows().size() > 0) {
inputs.push_back(&in_var->Get<SelectedRows>());
inputs.push_back(&in_var->Get<pten::SelectedRows>());
}
}
}
auto *out = context.Output<SelectedRows>("Out");
auto *out = context.Output<pten::SelectedRows>("Out");
out->mutable_rows()->clear();
bool has_data = false;
......@@ -183,8 +183,8 @@ class SumKernel : public framework::OpKernel<T> {
}
auto in = EigenVector<T>::Flatten(in_t);
result.device(place) = result + in;
} else if (in_vars[i]->IsType<framework::SelectedRows>()) {
auto &in_t = in_vars[i]->Get<framework::SelectedRows>();
} else if (in_vars[i]->IsType<pten::SelectedRows>()) {
auto &in_t = in_vars[i]->Get<pten::SelectedRows>();
functor(context.template device_context<DeviceContext>(), in_t, out);
} else {
PADDLE_THROW(platform::errors::InvalidArgument(
......@@ -194,7 +194,7 @@ class SumKernel : public framework::OpKernel<T> {
framework::ToTypeName(in_vars[i]->Type())));
}
}
} else if (out_var->IsType<framework::SelectedRows>()) {
} else if (out_var->IsType<pten::SelectedRows>()) {
SelectedRowsCompute<DeviceContext, T>(context);
} else if (out_var->IsType<framework::LoDTensorArray>()) {
LodTensorArrayCompute<DeviceContext, T>(context);
......
paddle/fluid/operators/uniform_random_op.cc
浏览文件 @ 2bafd338
......@@ -73,8 +73,8 @@ class CPUUniformRandomKernel : public framework::OpKernel<T> {
}
}
if (out_var->IsType<framework::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<framework::SelectedRows>();
if (out_var->IsType<pten::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<pten::SelectedRows>();
tensor = selected_rows->mutable_value();
auto shape = ctx.Attr<std::vector<int64_t>>("shape");
if (!new_shape.empty()) shape = new_shape;
......
paddle/fluid/operators/uniform_random_op.cu
浏览文件 @ 2bafd338
......@@ -111,8 +111,8 @@ class GPUUniformRandomKernel : public framework::OpKernel<T> {
}
}
if (out_var->IsType<framework::SelectedRows>()) {
auto* selected_rows = out_var->GetMutable<framework::SelectedRows>();
if (out_var->IsType<pten::SelectedRows>()) {
auto* selected_rows = out_var->GetMutable<pten::SelectedRows>();
tensor = selected_rows->mutable_value();
auto shape = context.Attr<std::vector<int64_t>>("shape");
if (!new_shape.empty()) shape = new_shape;
......
paddle/fluid/operators/uniform_random_op_npu.cc
浏览文件 @ 2bafd338
......@@ -40,8 +40,8 @@ class NPUUniformRandomKernel : public framework::OpKernel<T> {
}
}
if (out_var->IsType<framework::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<framework::SelectedRows>();
if (out_var->IsType<pten::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<pten::SelectedRows>();
tensor = selected_rows->mutable_value();
auto shape = ctx.Attr<std::vector<int64_t>>("shape");
if (!new_shape.empty()) shape = new_shape;
......
paddle/fluid/operators/uniform_random_op_xpu.cc
浏览文件 @ 2bafd338
......@@ -41,8 +41,8 @@ class XPUUniformRandomKernel : public framework::OpKernel<T> {
}
}
if (out_var->IsType<framework::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<framework::SelectedRows>();
if (out_var->IsType<pten::SelectedRows>()) {
auto *selected_rows = out_var->GetMutable<pten::SelectedRows>();
tensor = selected_rows->mutable_value();
auto shape = ctx.Attr<std::vector<int64_t>>("shape");
if (!new_shape.empty()) shape = new_shape;
......
paddle/fluid/pybind/imperative.cc
浏览文件 @ 2bafd338
......@@ -697,10 +697,10 @@ static void VarBaseCopy(std::shared_ptr<imperative::VarBase> &src, // NOLINT
platform::DeviceContextPool::Instance().Get(src_device)->Wait();
}
}
} else if (src->Var().IsType<framework::SelectedRows>()) {
auto &src_selected_rows = src->Var().Get<framework::SelectedRows>();
} else if (src->Var().IsType<pten::SelectedRows>()) {
auto &src_selected_rows = src->Var().Get<pten::SelectedRows>();
auto *dst_selected_rows =
dst.MutableVar()->GetMutable<framework::SelectedRows>();
dst.MutableVar()->GetMutable<pten::SelectedRows>();
dst_selected_rows->set_height(src_selected_rows.height());
dst_selected_rows->set_rows(src_selected_rows.rows());
framework::TensorCopy(src_selected_rows.value(), dst_device,
......@@ -1392,7 +1392,7 @@ void BindImperative(py::module *m_ptr) {
PADDLE_ENFORCE_EQ(
self.Var().IsType<framework::LoDTensor>() ||
self.Var().IsType<framework::SelectedRows>(),
self.Var().IsType<pten::SelectedRows>(),
true,
platform::errors::InvalidArgument(
"Type of Tensor[%s] must be LoDTensor or SelectedRows!",
......@@ -1423,15 +1423,14 @@ void BindImperative(py::module *m_ptr) {
detach_tensor->ShareInplaceVersionCounterWith(origin_tensor);
} else {
const auto &origin_selected_rows =
self.Var().Get<framework::SelectedRows>();
self.Var().Get<pten::SelectedRows>();
PADDLE_ENFORCE_EQ(
origin_selected_rows.value().IsInitialized(), true,
platform::errors::InvalidArgument(
"Tensor %s has not been initialized!", self.Name()));
auto *detach_selected_rows =
detach_var->MutableVar()
->GetMutable<framework::SelectedRows>();
detach_var->MutableVar()->GetMutable<pten::SelectedRows>();
detach_selected_rows->set_height(origin_selected_rows.height());
detach_selected_rows->set_rows(origin_selected_rows.rows());
detach_selected_rows->mutable_value()->ShareDataWith(
......@@ -1597,7 +1596,7 @@ void BindImperative(py::module *m_ptr) {
? grad_var->MutableVar()
->GetMutable<framework::LoDTensor>()
: grad_var->MutableVar()
->GetMutable<framework::SelectedRows>()
->GetMutable<pten::SelectedRows>()
->mutable_value();
if (tensor->IsInitialized()) {
......@@ -1613,7 +1612,7 @@ void BindImperative(py::module *m_ptr) {
})
.def("_is_sparse",
[](imperative::VarBase &self) {
return self.Var().IsType<framework::SelectedRows>();
return self.Var().IsType<pten::SelectedRows>();
})
.def("_allreduce",
[](imperative::VarBase &self,
......@@ -1623,7 +1622,7 @@ void BindImperative(py::module *m_ptr) {
#if NCCL_VERSION_CODE >= 2212
imperative::AllReduce(self.Var(), self.MutableVar(), strategy);
#else
if (!self.Var().IsType<framework::SelectedRows>()) {
if (!self.Var().IsType<pten::SelectedRows>()) {
imperative::AllReduce(self.Var(), self.MutableVar(), strategy);
} else {
PADDLE_THROW(platform::errors::Unimplemented(
......@@ -2126,11 +2125,10 @@ void BindImperative(py::module *m_ptr) {
.Get<framework::LoDTensor>()
.dims());
} else if (self.Var()
.IsType<
framework::SelectedRows>()) {
.IsType<pten::SelectedRows>()) {
return framework::vectorize<int>(
self.Var()
.Get<framework::SelectedRows>()
.Get<pten::SelectedRows>()
.value()
.dims());
} else if (self.Var()
......
paddle/fluid/pybind/io.cc
浏览文件 @ 2bafd338
......@@ -49,14 +49,13 @@ void BindIO(pybind11::module *m) {
return tellg;
});
m->def("save_selected_rows",
[](const paddle::framework::SelectedRows &selected_rows,
m->def("save_selected_rows", [](const pten::SelectedRows &selected_rows,
const std::string &str_file_name) {
std::ofstream fout(str_file_name, std::ios::binary);
PADDLE_ENFORCE_EQ(
static_cast<bool>(fout), true,
platform::errors::Unavailable(
"Cannot open %s to save SelectedRows.", str_file_name));
platform::errors::Unavailable("Cannot open %s to save SelectedRows.",
str_file_name));
paddle::framework::SerializeToStream(fout, selected_rows);
int64_t tellp = fout.tellp();
......@@ -64,14 +63,13 @@ void BindIO(pybind11::module *m) {
return tellp;
});
m->def("load_selected_rows",
[](paddle::framework::SelectedRows &selected_rows,
m->def("load_selected_rows", [](pten::SelectedRows &selected_rows,
const std::string &str_file_name) {
std::ifstream fin(str_file_name, std::ios::binary);
PADDLE_ENFORCE_EQ(
static_cast<bool>(fin), true,
platform::errors::Unavailable(
"Cannot open %s to load SelectedRows.", str_file_name));
platform::errors::Unavailable("Cannot open %s to load SelectedRows.",
str_file_name));
paddle::framework::DeserializeFromStream(fin, &selected_rows);
int64_t tellg = fin.tellg();
......@@ -93,14 +91,14 @@ void BindIO(pybind11::module *m) {
});
m->def("save_selected_rows_to_memory",
[](const paddle::framework::SelectedRows &selected_rows) -> py::bytes {
[](const pten::SelectedRows &selected_rows) -> py::bytes {
std::ostringstream ss;
paddle::framework::SerializeToStream(ss, selected_rows);
return ss.str();
});
m->def("load_selected_rows_from_memory",
[](paddle::framework::SelectedRows &selected_rows,
[](pten::SelectedRows &selected_rows,
const std::string &selected_rows_bytes) {
std::istringstream fin(selected_rows_bytes,
std::ios::in | std::ios::binary);
......
paddle/fluid/pybind/pybind.cc
浏览文件 @ 2bafd338
......@@ -1216,23 +1216,27 @@ PYBIND11_MODULE(core_noavx, m) {
}));
#endif
py::class_<SelectedRows>(m, "SelectedRows")
py::class_<pten::SelectedRows>(m, "SelectedRows")
.def("__init__",
[](SelectedRows &instance) { new (&instance) SelectedRows(); })
[](pten::SelectedRows &instance) {
new (&instance) pten::SelectedRows();
})
.def("__init__",
[](SelectedRows &instance, const std::vector<int64_t> rows,
[](pten::SelectedRows &instance, const std::vector<int64_t> rows,
const int64_t &height) {
new (&instance) SelectedRows(rows, height);
new (&instance) pten::SelectedRows(rows, height);
})
.def("get_tensor",
[](SelectedRows &self) { return self.mutable_value(); },
[](pten::SelectedRows &self) { return self.mutable_value(); },
py::return_value_policy::reference)
.def("numel",
[](SelectedRows &self) -> int64_t { return self.value().numel(); })
.def("set_height", &SelectedRows::set_height)
.def("height", &SelectedRows::height)
[](pten::SelectedRows &self) -> int64_t {
return self.value().numel();
})
.def("set_height", &pten::SelectedRows::set_height)
.def("height", &pten::SelectedRows::height)
.def("set_rows",
[](SelectedRows &self, std::vector<int64_t> rows) {
[](pten::SelectedRows &self, std::vector<int64_t> rows) {
#if !defined(PADDLE_WITH_CUDA) && !defined(PADDLE_WITH_HIP)
self.set_rows(rows);
#else
......@@ -1240,8 +1244,9 @@ PYBIND11_MODULE(core_noavx, m) {
self.set_rows(new_rows);
#endif
})
.def("sync_index", [](SelectedRows &instance) { instance.SyncIndex(); })
.def("rows", [](SelectedRows &self) {
.def("sync_index",
[](pten::SelectedRows &instance) { instance.SyncIndex(); })
.def("rows", [](pten::SelectedRows &self) {
auto rows = self.rows();
std::vector<int64_t> new_rows;
new_rows.reserve(rows.size());
......@@ -1290,8 +1295,8 @@ All parameter, weight, gradient are variables in Paddle.
[](Variable &self) { return self.GetMutable<LoDRankTable>(); },
py::return_value_policy::reference)
.def("get_selected_rows",
[](Variable &self) -> SelectedRows * {
return self.GetMutable<SelectedRows>();
[](Variable &self) -> pten::SelectedRows * {
return self.GetMutable<pten::SelectedRows>();
},
py::return_value_policy::reference)
.def("get_lod_tensor_array",
......
paddle/pten/api/lib/utils/tensor_utils.cc
浏览文件 @ 2bafd338
......@@ -261,10 +261,10 @@ std::unique_ptr<pten::TensorBase> MakePtenTensorBaseFromVar(
} else {
return MakePtenDenseTensor(tensor);
}
} else if (variable.IsType<framework::SelectedRows>()) {
} else if (variable.IsType<pten::SelectedRows>()) {
// TODO(chenweihang): now we don't deal with row and height
// by xiaowei's advice
const auto& tensor = variable.Get<framework::SelectedRows>();
const auto& tensor = variable.Get<pten::SelectedRows>();
if (!platform::is_same_place(tensor.value().place(), expected_place)) {
framework::Tensor tmp_tensor;
paddle::framework::TensorCopySync(
......@@ -289,8 +289,8 @@ std::unique_ptr<pten::TensorBase> MakePtenTensorBaseFromVar(
if (variable->template IsType<framework::LoDTensor>()) {
auto* tensor = variable->template GetMutable<framework::LoDTensor>();
return MakePtenDenseTensor(*tensor, arg_def);
} else if (variable->template IsType<framework::SelectedRows>()) {
auto* tensor = variable->template GetMutable<framework::SelectedRows>();
} else if (variable->template IsType<pten::SelectedRows>()) {
auto* tensor = variable->template GetMutable<pten::SelectedRows>();
// TODO(chenweihang): adapt SelectedRows by xiaowei's design,
// here the row and height will lost in output!
return MakePtenDenseTensor(tensor->value(), arg_def);
......@@ -389,8 +389,8 @@ void MakeVariableFromPtenTensor(pten::DenseTensor* src,
tensor->set_type(dtype);
}
} else if (variable->IsType<framework::SelectedRows>()) {
auto* tensor = variable->GetMutable<framework::SelectedRows>();
} else if (variable->IsType<pten::SelectedRows>()) {
auto* tensor = variable->GetMutable<pten::SelectedRows>();
auto dtype = pten::TransToProtoVarType(src->dtype());
if (!tensor->value().IsInitialized()) {
......
paddle/pten/core/CMakeLists.txt
浏览文件 @ 2bafd338
......@@ -21,7 +21,6 @@ cc_library(tensor_meta SRCS tensor_meta.cc DEPS pten_enforce mixed_vector)
cc_library(lod_utils SRCS lod_utils.cc DEPS pten_enforce mixed_vector)
cc_library(dense_tensor SRCS dense_tensor.cc DEPS convert_utils tensor_meta tensor_base)
cc_library(pten_device_context SRCS device_context.cc DEPS tensor_base )
cc_library(meta_tensor SRCS meta_tensor.cc DEPS tensor_base tensor_meta dense_tensor)
cc_library(infermeta_utils SRCS infermeta_utils.cc DEPS meta_tensor)
......
paddle/pten/tests/core/test_selected_rows.cc
浏览文件 @ 2bafd338
......@@ -40,7 +40,7 @@ class SelectedRowsTester : public ::testing::Test {
protected:
pten::CPUPlace place_;
std::unique_ptr<SelectedRows> selected_rows_{nullptr};
std::unique_ptr<pten::SelectedRows> selected_rows_{nullptr};
};
TEST_F(SelectedRowsTester, height) { ASSERT_EQ(selected_rows_->height(), 10); }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或