Skip to content

Commit 7190148

Browse files
jim19930609jim19930609
committed
Polished function names, removed duplicated forward declarations
1 parent 4f78067 commit 7190148

File tree

8 files changed

+27
-34
lines changed

8 files changed

+27
-34
lines changed

‎paddle/fluid/framework/device_worker.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ namespace framework {
4646
class Tensor;
4747
class ProgramDesc;
4848
class Scope;
49-
class Tensor;
5049
} // namespace framework
5150
namespace platform {
5251
class DeviceContext;

‎paddle/fluid/framework/var_type_traits.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class Tensor;
7474
class ReaderHolder;
7575
class Scope;
7676
class SelectedRows;
77-
class Tensor;
7877
} // namespace framework
7978

8079
namespace operators {

‎paddle/fluid/operators/math/beam_search.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License. */
1717
namespace paddle {
1818
namespace framework {
1919
class Tensor;
20-
class Tensor;
2120
} // namespace framework
2221
namespace platform {
2322
class CPUDeviceContext;

‎paddle/fluid/operators/math/beam_search_npu.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ limitations under the License. */
1818
namespace paddle {
1919
namespace framework {
2020
class Tensor;
21-
class Tensor;
2221
} // namespace framework
2322
namespace platform {
2423
class NPUDeviceContext;

‎paddle/fluid/operators/math/sequence_padding.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License. */
1717
namespace paddle {
1818
namespace framework {
1919
class Tensor;
20-
class Tensor;
2120
} // namespace framework
2221
namespace platform {
2322
class CPUDeviceContext;

‎paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ limitations under the License. */
2020
namespace paddle {
2121
namespace framework {
2222
class Tensor;
23-
class Tensor;
2423
} // namespace framework
2524
namespace platform {
2625
class MKLDNNDeviceContext;

‎paddle/pten/api/lib/utils/tensor_utils.cc‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void SetLoD(DstLoD* dst, const SrcLoD& src) {
3131
}
3232
}
3333

34-
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorOrig(
34+
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorBase(
3535
const paddle::framework::Tensor& src) {
3636
VLOG(3) << "MakePtenDenseTensor based Tensor.";
3737
pten::DenseTensorMeta meta{pten::TransToPtenDataType(src.type()),
@@ -44,15 +44,15 @@ std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorOrig(
4444
}
4545

4646
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensor(
47-
const paddle::framework::LoDTensor& src) {
48-
auto out = MakePtenDenseTensorOrig(
47+
const paddle::framework::Tensor& src) {
48+
auto out = MakePtenDenseTensorBase(
4949
static_cast<const paddle::framework::Tensor&>(src));
5050
SetLoD(&(pten::CompatibleDenseTensorUtils::GetMutableMeta(out.get())->lod),
5151
src.lod());
5252
return std::move(out);
5353
}
5454

55-
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorOrig(
55+
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorBase(
5656
const paddle::framework::Tensor& src, const pten::TensorArgDef& arg_def) {
5757
pten::DenseTensorMeta meta{
5858
arg_def.dtype, src.dims(), src.layout(), src.offset()};
@@ -71,16 +71,15 @@ std::unique_ptr<pten::DenseTensor> MakePtenDenseTensorOrig(
7171
}
7272

7373
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensor(
74-
const paddle::framework::LoDTensor& src,
75-
const pten::TensorArgDef& arg_def) {
76-
auto out = MakePtenDenseTensorOrig(
74+
const paddle::framework::Tensor& src, const pten::TensorArgDef& arg_def) {
75+
auto out = MakePtenDenseTensorBase(
7776
static_cast<const paddle::framework::Tensor&>(src), arg_def);
7877
SetLoD(&(pten::CompatibleDenseTensorUtils::GetMutableMeta(out.get())->lod),
7978
src.lod());
8079
return std::move(out);
8180
}
8281

83-
pten::Scalar MakePtenScalar(const paddle::framework::LoDTensor& src) {
82+
pten::Scalar MakePtenScalar(const paddle::framework::Tensor& src) {
8483
PADDLE_ENFORCE_EQ(src.numel(),
8584
1,
8685
paddle::platform::errors::InvalidArgument(
@@ -138,7 +137,7 @@ pten::Scalar MakePtenScalarFromVar(const framework::Variable& variable) {
138137
}
139138
}
140139

141-
pten::ScalarArray MakePtenScalarArray(const paddle::framework::LoDTensor& src) {
140+
pten::ScalarArray MakePtenScalarArray(const paddle::framework::Tensor& src) {
142141
if (src.type() == paddle::framework::proto::VarType::INT64) {
143142
return {src.data<int64_t>(), src.numel()};
144143
} else if (src.type() == paddle::framework::proto::VarType::INT32) {
@@ -295,7 +294,7 @@ std::unique_ptr<pten::TensorBase> MakePtenTensorBaseFromVar(
295294
return {};
296295
}
297296

298-
void MovesStorageOrig(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
297+
void MovesStorageBase(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
299298
PADDLE_ENFORCE_NOT_NULL(
300299
src,
301300
platform::errors::InvalidArgument(
@@ -313,12 +312,12 @@ void MovesStorageOrig(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
313312
dst->set_offset(src->meta().offset);
314313
}
315314

316-
void MovesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst) {
317-
MovesStorageOrig(src, static_cast<paddle::framework::Tensor*>(dst));
315+
void MovesStorage(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
316+
MovesStorageBase(src, static_cast<paddle::framework::Tensor*>(dst));
318317
SetLoD(dst->mutable_lod(), src->lod());
319318
}
320319

321-
void SharesStorageOrig(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
320+
void SharesStorageBase(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
322321
PADDLE_ENFORCE_NOT_NULL(
323322
src,
324323
platform::errors::InvalidArgument(
@@ -335,12 +334,12 @@ void SharesStorageOrig(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
335334
dst->set_offset(src->meta().offset);
336335
}
337336

338-
void SharesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst) {
339-
SharesStorageOrig(src, static_cast<paddle::framework::Tensor*>(dst));
337+
void SharesStorage(pten::DenseTensor* src, paddle::framework::Tensor* dst) {
338+
SharesStorageBase(src, static_cast<paddle::framework::Tensor*>(dst));
340339
SetLoD(dst->mutable_lod(), src->lod());
341340
}
342341

343-
void ReMakePtenDenseTensorOrig(const paddle::framework::Tensor& src,
342+
void ReMakePtenDenseTensorBase(const paddle::framework::Tensor& src,
344343
pten::DenseTensor* dst) {
345344
VLOG(3) << "ReMakePtenDenseTensor based Tensor.";
346345
auto* meta = pten::CompatibleDenseTensorUtils::GetMutableMeta(dst);
@@ -363,15 +362,15 @@ void ReMakePtenDenseTensorOrig(const paddle::framework::Tensor& src,
363362
shared_storage->ResetAllocation(src.Holder());
364363
}
365364

366-
void ReMakePtenDenseTensor(const paddle::framework::LoDTensor& src,
365+
void ReMakePtenDenseTensor(const paddle::framework::Tensor& src,
367366
pten::DenseTensor* dst) {
368367
auto* meta = pten::CompatibleDenseTensorUtils::GetMutableMeta(dst);
369368
SetLoD(&meta->lod, src.lod());
370-
ReMakePtenDenseTensorOrig(static_cast<const paddle::framework::Tensor&>(src),
369+
ReMakePtenDenseTensorBase(static_cast<const paddle::framework::Tensor&>(src),
371370
dst);
372371
}
373372

374-
void ReMakePtenDenseTensorByArgDefOrig(const paddle::framework::Tensor& src,
373+
void ReMakePtenDenseTensorByArgDefBase(const paddle::framework::Tensor& src,
375374
const pten::TensorArgDef& arg_def,
376375
pten::DenseTensor* dst) {
377376
VLOG(3) << "ReMakePtenDenseTensor based Tensor and TensorArgDef.";
@@ -397,12 +396,12 @@ void ReMakePtenDenseTensorByArgDefOrig(const paddle::framework::Tensor& src,
397396
}
398397
}
399398

400-
void ReMakePtenDenseTensorByArgDef(const paddle::framework::LoDTensor& src,
399+
void ReMakePtenDenseTensorByArgDef(const paddle::framework::Tensor& src,
401400
const pten::TensorArgDef& arg_def,
402401
pten::DenseTensor* dst) {
403402
auto* meta = pten::CompatibleDenseTensorUtils::GetMutableMeta(dst);
404403
SetLoD(&meta->lod, src.lod());
405-
ReMakePtenDenseTensorByArgDefOrig(
404+
ReMakePtenDenseTensorByArgDefBase(
406405
static_cast<const paddle::framework::Tensor&>(src), arg_def, dst);
407406
}
408407

‎paddle/pten/api/lib/utils/tensor_utils.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ namespace paddle {
3131
namespace experimental {
3232

3333
std::unique_ptr<pten::DenseTensor> MakePtenDenseTensor(
34-
const paddle::framework::LoDTensor& src);
34+
const paddle::framework::Tensor& src);
3535

36-
pten::Scalar MakePtenScalar(const paddle::framework::LoDTensor& src);
36+
pten::Scalar MakePtenScalar(const paddle::framework::Tensor& src);
3737

38-
pten::ScalarArray MakePtenScalarArray(const paddle::framework::LoDTensor& src);
38+
pten::ScalarArray MakePtenScalarArray(const paddle::framework::Tensor& src);
3939

4040
pten::Scalar MakePtenScalarFromVar(const framework::Variable& variable);
4141

@@ -51,9 +51,9 @@ std::unique_ptr<pten::TensorBase> MakePtenTensorBaseFromVar(
5151
std::unique_ptr<pten::TensorBase> MakePtenTensorBaseFromVar(
5252
framework::Variable* variable, const pten::TensorArgDef& arg_def);
5353

54-
void MovesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst);
54+
void MovesStorage(pten::DenseTensor* src, paddle::framework::Tensor* dst);
5555

56-
void SharesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst);
56+
void SharesStorage(pten::DenseTensor* src, paddle::framework::Tensor* dst);
5757

5858
/**
5959
* In order to improve the compatibility state performance, some tricky tool
@@ -64,10 +64,10 @@ void SharesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst);
6464
* the overhead caused by frequent construction and destruction of the
6565
* DenseTensor.
6666
*/
67-
void ReMakePtenDenseTensor(const paddle::framework::LoDTensor& src,
67+
void ReMakePtenDenseTensor(const paddle::framework::Tensor& src,
6868
pten::DenseTensor* dst);
6969

70-
void ReMakePtenDenseTensorByArgDef(const paddle::framework::LoDTensor& src,
70+
void ReMakePtenDenseTensorByArgDef(const paddle::framework::Tensor& src,
7171
const pten::TensorArgDef& arg_def,
7272
pten::DenseTensor* dst);
7373

0 commit comments

Comments
 (0)