m53297601
/
Paddle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename macro, test=develop (#23161)

Browse Source
revert-23830-2.0-beta
Zeng Jinle 6 years ago committed by GitHub
parent bba740710d
commit 53e6f8e1da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
paddle/fluid/framework/no_need_buffer_vars_inference.h
Unescape View File

@ -81,7 +81,7 @@ class NoNeedBufferVarsInference {
} }
}; };
#define DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(class_type, ...) \ #define DECLARE_NO_NEED_BUFFER_VARS_INFERER(class_type, ...) \
class class_type final \ class class_type final \
: public ::paddle::framework::NoNeedBufferVarsInference { \ : public ::paddle::framework::NoNeedBufferVarsInference { \
public: \ public: \
@ -96,9 +96,6 @@ class NoNeedBufferVarsInference {
} \ } \
} }
#define DECLARE_NO_NEED_BUFFER_VARS_INFERER \
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE
class InferNoNeedBufferVarsFN { class InferNoNeedBufferVarsFN {
public: public:
inline const std::unordered_set<std::string> &operator()( inline const std::unordered_set<std::string> &operator()(

3
paddle/fluid/operators/pad2d_op.cc
Unescape View File

@ -646,8 +646,7 @@ class Pad2dOpGradMaker : public framework::SingleGradOpMaker<T> {
}; };
// TODO(zjl): Paddings can also be skipped! // TODO(zjl): Paddings can also be skipped!
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(Pad2dOpGradNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(Pad2dOpGradNoNeedBufferVarsInference, "X");
"X");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

2
paddle/fluid/operators/pool_with_index_op.cc
Unescape View File

@ -307,7 +307,7 @@ class MaxPoolWithIndexGradOpMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE( DECLARE_NO_NEED_BUFFER_VARS_INFERER(
MaxPoolWithIndexOpGradNoNeedBufferVarsInference, "X"); MaxPoolWithIndexOpGradNoNeedBufferVarsInference, "X");
} // namespace operators } // namespace operators

4
paddle/fluid/operators/reshape_op.cc
Unescape View File

@ -542,8 +542,8 @@ DECLARE_INPLACE_OP_INFERER(ReshapeGradInplaceInToOut,
{framework::GradVarName("Out"), {framework::GradVarName("Out"),
framework::GradVarName("X")}); framework::GradVarName("X")});
DECLARE_INPLACE_OP_INFERER(ReshapeDoubleGradInplaceInToOut, {"DDX", "DDOut"}); DECLARE_INPLACE_OP_INFERER(ReshapeDoubleGradInplaceInToOut, {"DDX", "DDOut"});
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE( DECLARE_NO_NEED_BUFFER_VARS_INFERER(ReshapeDoubleGradOpNoNeedBufferVarInference,
ReshapeDoubleGradOpNoNeedBufferVarInference, "DOut"); "DOut");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

2
paddle/fluid/operators/roi_align_op.cc
Unescape View File

@ -169,7 +169,7 @@ class ROIAlignGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(RoiAlignGradNoNeedBufVarsInferer, "X"); DECLARE_NO_NEED_BUFFER_VARS_INFERER(RoiAlignGradNoNeedBufVarsInferer, "X");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

2
paddle/fluid/operators/scatter_nd_add_op.cc
Unescape View File

@ -159,7 +159,7 @@ class ScatterNdAddGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(ScatterNdAddGradNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(ScatterNdAddGradNoNeedBufferVarsInference,
"Updates"); "Updates");
} // namespace operators } // namespace operators

2
paddle/fluid/operators/scatter_op.cc
Unescape View File

@ -125,7 +125,7 @@ class ScatterGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(ScatterGradNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(ScatterGradNoNeedBufferVarsInference,
"Updates"); "Updates");
DECLARE_INPLACE_OP_INFERER(ScatterInplaceInferer, {"X", "Out"}); DECLARE_INPLACE_OP_INFERER(ScatterInplaceInferer, {"X", "Out"});

2
paddle/fluid/operators/slice_op.cc
Unescape View File

@ -315,7 +315,7 @@ class SliceDoubleOpGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(SliceOpGradNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(SliceOpGradNoNeedBufferVarsInference,
"Input"); "Input");
} // namespace operators } // namespace operators

2
paddle/fluid/operators/space_to_depth_op.cc
Unescape View File

@ -131,7 +131,7 @@ class SpaceToDepthOpMaker : public framework::OpProtoAndCheckerMaker {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(SpaceToDepthGradOpNoBuffer, "X"); DECLARE_NO_NEED_BUFFER_VARS_INFERER(SpaceToDepthGradOpNoBuffer, "X");
template <typename T> template <typename T>
class SpaceToDepthGradOpMaker : public framework::SingleGradOpMaker<T> { class SpaceToDepthGradOpMaker : public framework::SingleGradOpMaker<T> {

3
paddle/fluid/operators/squared_l2_distance_op.cc
Unescape View File

@ -71,8 +71,7 @@ class SquaredL2DistanceOp : public framework::OperatorWithKernel {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(SquaredL2DistanceGradOpNoBuffer, "X", DECLARE_NO_NEED_BUFFER_VARS_INFERER(SquaredL2DistanceGradOpNoBuffer, "X", "Y");
"Y");
template <typename T> template <typename T>
class SquaredL2DistanceGradOpMaker : public framework::SingleGradOpMaker<T> { class SquaredL2DistanceGradOpMaker : public framework::SingleGradOpMaker<T> {

3
paddle/fluid/operators/squeeze_op.cc
Unescape View File

@ -286,8 +286,7 @@ DECLARE_INPLACE_OP_INFERER(SequeezeInplaceInferer, {"X", "Out"});
DECLARE_INPLACE_OP_INFERER(SequeezeGradInplaceInferer, DECLARE_INPLACE_OP_INFERER(SequeezeGradInplaceInferer,
{framework::GradVarName("Out"), {framework::GradVarName("Out"),
framework::GradVarName("X")}); framework::GradVarName("X")});
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(SqueezeGradNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(SqueezeGradNoNeedBufferVarsInference, "X");
"X");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

4
paddle/fluid/operators/strided_slice_op.cc
Unescape View File

@ -272,8 +272,8 @@ class StridedSliceOpGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE( DECLARE_NO_NEED_BUFFER_VARS_INFERER(StridedSliceOpGradNoNeedBufferVarsInference,
StridedSliceOpGradNoNeedBufferVarsInference, "Input"); "Input");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

3
paddle/fluid/operators/unfold_op.cc
Unescape View File

@ -163,8 +163,7 @@ class UnfoldGradMaker : public framework::SingleGradOpMaker<T> {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(UnfoldGradOpNoNeedBufferVarsInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(UnfoldGradOpNoNeedBufferVarsInference, "X");
"X");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

2
paddle/fluid/operators/unsqueeze_op.cc
Unescape View File

@ -282,7 +282,7 @@ DECLARE_INPLACE_OP_INFERER(UnsqueezeInplaceInferer, {"X", "Out"});
DECLARE_INPLACE_OP_INFERER(UnsqueezeGradInplaceInferer, DECLARE_INPLACE_OP_INFERER(UnsqueezeGradInplaceInferer,
{framework::GradVarName("Out"), {framework::GradVarName("Out"),
framework::GradVarName("X")}); framework::GradVarName("X")});
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(UnsqueezeGradOpNoNeedBufferVarInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(UnsqueezeGradOpNoNeedBufferVarInference,
"X"); "X");
} // namespace operators } // namespace operators
} // namespace paddle } // namespace paddle

2
paddle/fluid/operators/warpctc_op.cc
Unescape View File

@ -178,7 +178,7 @@ class WarpCTCGradOp : public framework::OperatorWithKernel {
} }
}; };
DECLARE_NO_NEED_BUFFER_VARS_INFERENCE(WarpCTCGradOpNoNeedBufferVarInference, DECLARE_NO_NEED_BUFFER_VARS_INFERER(WarpCTCGradOpNoNeedBufferVarInference,
"Logits"); "Logits");
} // namespace operators } // namespace operators

Write Preview
Loading…
Cancel
Save