Skip to content

Commit 816b04f

Browse files
co63occo63oc
committed
Merge branch 'develop' into m21
2 parents 70a976d + e30de9e commit 816b04f

28 files changed

+57
-63
lines changed

‎paddle/ap/include/axpr/builtin_class_instance_method_class.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ struct MethodClassImpl<ValueT, BuiltinClassInstance<ValueT>> {
8888
if (opt_val.has_value()) {
8989
return opt_val.value();
9090
}
91-
const auto& opt_gettattr = GetClassAttr(self, "__getattr__");
91+
const auto& opt_getattr = GetClassAttr(self, "__getattr__");
9292
const auto& class_attrs = self.type.class_attrs();
93-
ADT_CHECK(opt_gettattr.has_value())
93+
ADT_CHECK(opt_getattr.has_value())
9494
<< adt::errors::AttributeError{std::string() + class_attrs->class_name +
9595
" class has no attribute '__getattr__'"};
9696
std::vector<ValueT> args{attr_name_val};
9797
ADT_LET_CONST_REF(ret,
98-
interpreter->InterpretCall(opt_gettattr.value(), args));
98+
interpreter->InterpretCall(opt_getattr.value(), args));
9999
return ret;
100100
}
101101

‎paddle/cinn/backends/codegen_c.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,8 @@ void CodeGenC::Visit(const ir::_LoweredFunc_ *op) {
870870
std::vector<Expr> new_body;
871871

872872
std::vector<Expr> create_temp_buffers = op->PrepareCreateTempBufferExprs();
873-
std::vector<Expr> alloca_temp_buffers = op->PrepareAllocTempBufferExprs();
874-
std::vector<Expr> dealloca_temp_buffers = op->PrepareDeallocTempBufferExprs();
873+
std::vector<Expr> alloc_temp_buffers = op->PrepareAllocTempBufferExprs();
874+
std::vector<Expr> dealloc_temp_buffers = op->PrepareDeallocTempBufferExprs();
875875
#define APPEND_TO_NEW_BODY(field__) \
876876
new_body.insert( \
877877
std::end(new_body), std::begin(op->field__), std::end(op->field__));
@@ -881,13 +881,13 @@ void CodeGenC::Visit(const ir::_LoweredFunc_ *op) {
881881
std::end(create_temp_buffers));
882882
APPEND_TO_NEW_BODY(alloc_output_buffer_exprs)
883883
new_body.insert(std::end(new_body),
884-
std::begin(alloca_temp_buffers),
885-
std::end(alloca_temp_buffers));
884+
std::begin(alloc_temp_buffers),
885+
std::end(alloc_temp_buffers));
886886
APPEND_TO_NEW_BODY(buffer_data_cast_exprs)
887887
new_body.push_back(op->body);
888888
new_body.insert(std::end(new_body),
889-
std::begin(dealloca_temp_buffers),
890-
std::end(dealloca_temp_buffers));
889+
std::begin(dealloc_temp_buffers),
890+
std::end(dealloc_temp_buffers));
891891
APPEND_TO_NEW_BODY(dealloc_output_buffer_exprs)
892892

893893
Expr func_body = ir::Block::Make(new_body);

‎paddle/cinn/backends/codegen_gpu_dev.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void CodeGenGpuDev::Visit(const ir::_LoweredFunc_ *op) {
170170

171171
auto axis_range_assumption_stmts = op->PrepareAxisRangeAssumptionStmts();
172172
auto alloca_temp_buffer_stmts = op->PrepareAllocTempBufferStmts();
173-
auto temp_buffer_alia_stmts = GenerateBufferAliasStmts(op, op->temp_bufs);
173+
auto temp_buffer_alias_stmts = GenerateBufferAliasStmts(op, op->temp_bufs);
174174
auto alias_var_stmts = op->CudaAliasVarStmts();
175175
auto dealloc_temp_buffer_stmts =
176176
FilterDeallocTempBuffers(op->PrepareDeallocTempBufferStmts());
@@ -180,7 +180,7 @@ void CodeGenGpuDev::Visit(const ir::_LoweredFunc_ *op) {
180180
std::end(new_body_stmts), std::begin(field__), std::end(field__));
181181
APPEND_TO_NEW_BODY_STMTS(axis_range_assumption_stmts)
182182
APPEND_TO_NEW_BODY_STMTS(alloca_temp_buffer_stmts)
183-
APPEND_TO_NEW_BODY_STMTS(temp_buffer_alia_stmts)
183+
APPEND_TO_NEW_BODY_STMTS(temp_buffer_alias_stmts)
184184
APPEND_TO_NEW_BODY_STMTS(alias_var_stmts)
185185
APPEND_TO_NEW_BODY_STMTS(op->body_block->stmts())
186186
APPEND_TO_NEW_BODY_STMTS(dealloc_temp_buffer_stmts);

‎paddle/cinn/backends/llvm/codegen_llvm.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,16 +1165,16 @@ llvm::Value *CodeGenLLVM::Visit(const ir::_LoweredFunc_ *op) {
11651165

11661166
std::vector<Expr> new_body;
11671167
auto create_temp_buffers = op->PrepareCreateTempBufferExprs();
1168-
auto alloca_temp_buffers = op->PrepareAllocTempBufferExprs();
1169-
auto dealloca_temp_buffers = op->PrepareDeallocTempBufferExprs();
1168+
auto alloc_temp_buffers = op->PrepareAllocTempBufferExprs();
1169+
auto dealloc_temp_buffers = op->PrepareDeallocTempBufferExprs();
11701170

11711171
appendBody(new_body, op->argument_prepare_exprs);
11721172
appendBody(new_body, create_temp_buffers);
1173-
appendBody(new_body, alloca_temp_buffers);
1173+
appendBody(new_body, alloc_temp_buffers);
11741174
appendBody(new_body, op->alloc_output_buffer_exprs);
11751175
appendBody(new_body, op->buffer_data_cast_exprs);
11761176
appendBody(new_body, op->body);
1177-
appendBody(new_body, dealloca_temp_buffers);
1177+
appendBody(new_body, dealloc_temp_buffers);
11781178
appendBody(new_body, op->dealloc_output_buffer_exprs);
11791179

11801180
ir::Expr function_body = ir::Block::Make(new_body);

‎paddle/cinn/backends/nvrtc/nvrtc_util.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,6 @@ std::string Compiler::CompileWithNvcc(const std::string& cuda_c) {
291291
return prefix_name_ + ".cubin";
292292
}
293293

294-
// std::string Compiler::GetPtx() { return ReadFile(prefix_name_ + ".ptx",
295-
// std::ios::in); }
296-
297294
void Compiler::CompileToPtx() {
298295
auto include_dir = cinn::common::Context::Global().runtime_include_dir();
299296
std::string include_dir_str = "";

‎paddle/cinn/backends/sycl/codegen_sycl_dev.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void CodeGenSyclDevice::PrintFunctionBody(const ir::_LoweredFunc_ *op) {
156156
std::vector<ir::stmt::StmtRef> new_body_stmts;
157157
auto axis_range_assumption_stmts = op->PrepareAxisRangeAssumptionStmts();
158158
auto alloca_temp_buffer_stmts = op->PrepareAllocTempBufferStmts();
159-
auto temp_buffer_alia_stmts = GenerateBufferAliasStmts(op, op->temp_bufs);
159+
auto temp_buffer_alias_stmts = GenerateBufferAliasStmts(op, op->temp_bufs);
160160
auto alias_var_stmts = op->CudaAliasVarStmts();
161161
auto dealloc_temp_buffer_stmts =
162162
FilterDeallocTempBuffers(op->PrepareDeallocTempBufferStmts());
@@ -165,7 +165,7 @@ void CodeGenSyclDevice::PrintFunctionBody(const ir::_LoweredFunc_ *op) {
165165
std::end(new_body_stmts), std::begin(field__), std::end(field__));
166166
APPEND_TO_NEW_BODY_STMTS(axis_range_assumption_stmts)
167167
APPEND_TO_NEW_BODY_STMTS(alloca_temp_buffer_stmts)
168-
APPEND_TO_NEW_BODY_STMTS(temp_buffer_alia_stmts)
168+
APPEND_TO_NEW_BODY_STMTS(temp_buffer_alias_stmts)
169169
APPEND_TO_NEW_BODY_STMTS(alias_var_stmts)
170170
APPEND_TO_NEW_BODY_STMTS(op->body_block->stmts())
171171
APPEND_TO_NEW_BODY_STMTS(dealloc_temp_buffer_stmts);

‎paddle/fluid/framework/ir/embedding_eltwise_layernorm_fuse_pass.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,4 +477,4 @@ REGISTER_PASS_CAPABILITY(embedding_eltwise_layernorm_fuse_pass)
477477
paddle::framework::compatible::OpVersionComparatorCombination()
478478
.LE("lookup_table", 1)
479479
.LE("lookup_table_v2", 1)
480-
.LE("elementweise_add", 1));
480+
.LE("elementwise_add", 1));

‎paddle/fluid/framework/ir/graph_pattern_detector.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5436,7 +5436,7 @@ PDNode *patterns::BNAddActConvGrad::operator()(
54365436
return bn1_grad;
54375437
}
54385438

5439-
void patterns::SparseConvOptimPartern::operator()() {
5439+
void patterns::SparseConvOptimPattern::operator()() {
54405440
auto sp_conv3d_x = pattern->NewNode(sp_conv3d_x_repr())
54415441
->AsInput()
54425442
->assert_is_op_input("sparse_conv3d", "x");

‎paddle/fluid/framework/ir/graph_pattern_detector.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2637,9 +2637,9 @@ struct BNAddActConvGrad : public PatternBase {
26372637
PATTERN_DECL_NODE(d_bn2_bias);
26382638
};
26392639

2640-
struct SparseConvOptimPartern : public PatternBase {
2641-
SparseConvOptimPartern(PDPattern* pattern, const std::string& name_scope)
2642-
: PatternBase(pattern, name_scope, "sparse_conv_optim_partern") {}
2640+
struct SparseConvOptimPattern : public PatternBase {
2641+
SparseConvOptimPattern(PDPattern* pattern, const std::string& name_scope)
2642+
: PatternBase(pattern, name_scope, "sparse_conv_optim_pattern") {}
26432643

26442644
void operator()();
26452645
PATTERN_DECL_NODE(sp_conv3d_x);

‎paddle/fluid/framework/ir/layer_norm_fuse_pass.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool validateReduceOpAttrs(const Node* node,
7272
}
7373
for (size_t i = 1; i < dims.size(); ++i) {
7474
if (1 != dims[i] - dims[i - 1]) {
75-
LOG(WARNING) << "The LayerNorm dim of mean must be continuous";
75+
LOG(WARNING) << "The LayerNorm dim of mean must be continuous";
7676
return false;
7777
}
7878
}

0 commit comments

Comments
 (0)