Skip to content

Commit af675d2

Browse files
co63occo63oc
authored
Replace phi::errors to ::common::errors in cinn [fluid_ops] part2 (#67114)
* Fix * ci
1 parent f33b758 commit af675d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1366
-1350
lines changed

‎paddle/cinn/hlir/op/broadcast.cc

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -74,37 +74,37 @@ std::shared_ptr<OpStrategy> StrategyForBroadcast(
7474
PADDLE_ENFORCE_NE(
7575
args.empty(),
7676
true,
77-
phi::errors::InvalidArgument(
77+
::common::errors::InvalidArgument(
7878
"The input argument of %s compute is empty! Please check.",
7979
op_name));
8080
CINNValuePack pack_args = args[0];
8181
PADDLE_ENFORCE_GE(pack_args.size(),
8282
2U,
83-
phi::errors::InvalidArgument(
83+
::common::errors::InvalidArgument(
8484
"At least 2 input tensors for %s compute, but got %d",
8585
op_name,
8686
pack_args.size()));
8787
PADDLE_ENFORCE_GE(pack_args.size(),
8888
3U,
89-
phi::errors::InvalidArgument(
89+
::common::errors::InvalidArgument(
9090
"At least 3 input tensors for %s compute, but got %d",
9191
op_name,
9292
pack_args.size()));
9393
PADDLE_ENFORCE_EQ(
9494
pack_args[2].is_string(),
9595
true,
96-
phi::errors::InvalidArgument(
96+
::common::errors::InvalidArgument(
9797
"Required pack_args[2] must be a string. Please check."));
9898
std::string tensor_name = pack_args[2].operator std::string();
9999
Expr A_expr = pack_args[0];
100100
Expr B_expr = pack_args[1];
101101
PADDLE_ENFORCE_NOT_NULL(
102102
A_expr.as_tensor(),
103-
phi::errors::InvalidArgument(
103+
::common::errors::InvalidArgument(
104104
"Required Input must be a tensor. Please check."));
105105
PADDLE_ENFORCE_NOT_NULL(
106106
B_expr.as_tensor(),
107-
phi::errors::InvalidArgument(
107+
::common::errors::InvalidArgument(
108108
"Required Input must be a tensor. Please check."));
109109
ir::Tensor A = A_expr.as_tensor_ref();
110110
ir::Tensor B = B_expr.as_tensor_ref();
@@ -143,37 +143,37 @@ std::shared_ptr<OpStrategy> StrategyForBroadcastSymbolic(
143143
PADDLE_ENFORCE_NE(
144144
args.empty(),
145145
true,
146-
phi::errors::InvalidArgument(
146+
::common::errors::InvalidArgument(
147147
"The input argument of %s compute is empty! Please check.",
148148
op_name));
149149
CINNValuePack pack_args = args[0];
150150
PADDLE_ENFORCE_GE(pack_args.size(),
151151
2U,
152-
phi::errors::InvalidArgument(
152+
::common::errors::InvalidArgument(
153153
"At least 2 input tensors for %s compute, but got %d",
154154
op_name,
155155
pack_args.size()));
156156
PADDLE_ENFORCE_GE(pack_args.size(),
157157
3U,
158-
phi::errors::InvalidArgument(
158+
::common::errors::InvalidArgument(
159159
"At least 3 input tensors for %s compute, but got %d",
160160
op_name,
161161
pack_args.size()));
162162
PADDLE_ENFORCE_EQ(
163163
pack_args[2].is_string(),
164164
true,
165-
phi::errors::InvalidArgument(
165+
::common::errors::InvalidArgument(
166166
"Required pack_args[2] must be a string. Please check."));
167167
std::string tensor_name = pack_args[2].operator std::string();
168168
Expr A_expr = pack_args[0];
169169
Expr B_expr = pack_args[1];
170170
PADDLE_ENFORCE_NOT_NULL(
171171
A_expr.as_tensor(),
172-
phi::errors::InvalidArgument(
172+
::common::errors::InvalidArgument(
173173
"Required Input must be a tensor. Please check."));
174174
PADDLE_ENFORCE_NOT_NULL(
175175
B_expr.as_tensor(),
176-
phi::errors::InvalidArgument(
176+
::common::errors::InvalidArgument(
177177
"Required Input must be a tensor. Please check."));
178178
ir::Tensor A = A_expr.as_tensor_ref();
179179
ir::Tensor B = B_expr.as_tensor_ref();
@@ -206,14 +206,14 @@ std::shared_ptr<OpStrategy> StrategyForBroadcastTo(
206206
PADDLE_ENFORCE_GE(
207207
attrs.attr_store.count("out_shape"),
208208
1,
209-
phi::errors::InvalidArgument(
209+
::common::errors::InvalidArgument(
210210
"The attrs.attr_store doesn't have the attribute of 'out_shape'."));
211211
out_shape = absl::get<std::vector<int>>(attrs.attr_store.at("out_shape"));
212212
PADDLE_ENFORCE_GE(
213213
attrs.attr_store.count("broadcast_axes"),
214214
1,
215-
phi::errors::InvalidArgument("The attrs.attr_store doesn't have the "
216-
"attribute of 'broadcast_axes'."));
215+
::common::errors::InvalidArgument("The attrs.attr_store doesn't have the "
216+
"attribute of 'broadcast_axes'."));
217217
broadcast_axes =
218218
absl::get<std::vector<int>>(attrs.attr_store.at("broadcast_axes"));
219219
VLOG(3) << "broadcast out shape: " << utils::Join(out_shape, ", ");
@@ -224,30 +224,30 @@ std::shared_ptr<OpStrategy> StrategyForBroadcastTo(
224224
PADDLE_ENFORCE_NE(
225225
args.empty(),
226226
true,
227-
phi::errors::InvalidArgument("The input argument of broadcast_to "
228-
"compute is empty! Please check."));
227+
::common::errors::InvalidArgument("The input argument of broadcast_to "
228+
"compute is empty! Please check."));
229229
CINNValuePack pack_args = args[0];
230230
PADDLE_ENFORCE_NE(
231231
pack_args.empty(),
232232
true,
233-
phi::errors::InvalidArgument("The input tensors of broadcast_to "
234-
"compute is empty! Please check."));
233+
::common::errors::InvalidArgument("The input tensors of broadcast_to "
234+
"compute is empty! Please check."));
235235
PADDLE_ENFORCE_GE(
236236
pack_args.size(),
237237
2U,
238-
phi::errors::InvalidArgument(
238+
::common::errors::InvalidArgument(
239239
"Required at least 2 input tensors, but got %d", pack_args.size()));
240240
PADDLE_ENFORCE_EQ(
241241
pack_args[1].is_string(),
242242
true,
243-
phi::errors::InvalidArgument(
243+
::common::errors::InvalidArgument(
244244
"Required pack_args[1] must be a string. Please check."));
245245
std::string tensor_name = pack_args[1].operator std::string();
246246

247247
Expr A_expr = pack_args[0];
248248
PADDLE_ENFORCE_NOT_NULL(
249249
A_expr.as_tensor(),
250-
phi::errors::InvalidArgument(
250+
::common::errors::InvalidArgument(
251251
"Required Input must be a tensor. Please check."));
252252
ir::Tensor A = A_expr.as_tensor_ref();
253253
auto out = pe::BroadcastTo(A, out_shape, broadcast_axes, tensor_name);
@@ -271,7 +271,7 @@ std::shared_ptr<OpStrategy> StrategyForBroadcastToSymbolic(
271271
const Target &target) {
272272
PADDLE_ENFORCE_EQ(output_shapes.size(),
273273
1,
274-
phi::errors::InvalidArgument(
274+
::common::errors::InvalidArgument(
275275
"The size of output_shapes must be 1, but got %d.",
276276
output_shapes.size()));
277277
std::vector<ir::Expr> out_shape(output_shapes[0].size());
@@ -281,42 +281,42 @@ std::shared_ptr<OpStrategy> StrategyForBroadcastToSymbolic(
281281
[](const ir::Dim &dim) { return dim->dim_expr; });
282282
VLOG(3) << "broadcast out shape: " << utils::Join(out_shape, ", ");
283283

284-
framework::CINNCompute broadcast_to_compute(
285-
[=](lang::Args args, lang::RetValue *ret) {
286-
PADDLE_ENFORCE_NE(
287-
args.empty(),
288-
true,
289-
phi::errors::InvalidArgument("The input argument of broadcast_to "
290-
"compute is empty! Please check."));
291-
CINNValuePack pack_args = args[0];
292-
PADDLE_ENFORCE_NE(
293-
pack_args.empty(),
294-
true,
295-
phi::errors::InvalidArgument("The input tensors of broadcast_to "
296-
"compute is empty! Please check."));
297-
std::string tensor_name = [&] {
298-
if (pack_args.size() == 2) {
299-
return pack_args[1].operator std::string();
300-
} else {
301-
PADDLE_ENFORCE_EQ(pack_args.size(),
302-
3,
303-
::common::errors::InvalidArgument(
304-
"The number of input tensors is wrong. "
305-
"The expected inputs is 3, but now is %d.",
306-
pack_args.size()));
307-
return pack_args[2].operator std::string();
308-
}
309-
}();
310-
311-
Expr A_expr = pack_args[0];
312-
PADDLE_ENFORCE_NOT_NULL(
313-
A_expr.as_tensor(),
314-
phi::errors::InvalidArgument(
315-
"Required Input must be a tensor. Please check."));
316-
ir::Tensor A = A_expr.as_tensor_ref();
317-
auto out = pe::BroadcastTo(A, out_shape, tensor_name);
318-
*ret = CINNValuePack{{CINNValue(out)}};
319-
});
284+
framework::CINNCompute broadcast_to_compute([=](lang::Args args,
285+
lang::RetValue *ret) {
286+
PADDLE_ENFORCE_NE(
287+
args.empty(),
288+
true,
289+
::common::errors::InvalidArgument("The input argument of broadcast_to "
290+
"compute is empty! Please check."));
291+
CINNValuePack pack_args = args[0];
292+
PADDLE_ENFORCE_NE(
293+
pack_args.empty(),
294+
true,
295+
::common::errors::InvalidArgument("The input tensors of broadcast_to "
296+
"compute is empty! Please check."));
297+
std::string tensor_name = [&] {
298+
if (pack_args.size() == 2) {
299+
return pack_args[1].operator std::string();
300+
} else {
301+
PADDLE_ENFORCE_EQ(pack_args.size(),
302+
3,
303+
::common::errors::InvalidArgument(
304+
"The number of input tensors is wrong. "
305+
"The expected inputs is 3, but now is %d.",
306+
pack_args.size()));
307+
return pack_args[2].operator std::string();
308+
}
309+
}();
310+
311+
Expr A_expr = pack_args[0];
312+
PADDLE_ENFORCE_NOT_NULL(
313+
A_expr.as_tensor(),
314+
::common::errors::InvalidArgument(
315+
"Required Input must be a tensor. Please check."));
316+
ir::Tensor A = A_expr.as_tensor_ref();
317+
auto out = pe::BroadcastTo(A, out_shape, tensor_name);
318+
*ret = CINNValuePack{{CINNValue(out)}};
319+
});
320320

321321
auto strategy = std::make_shared<framework::OpStrategy>();
322322
strategy->AddImpl(

‎paddle/cinn/hlir/op/contrib/argmax.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ std::vector<ir::Tensor> Argmax(const Tensor &in_tensor,
5151
PADDLE_ENFORCE_GT(
5252
ndim,
5353
0,
54-
phi::errors::InvalidArgument(
54+
::common::errors::InvalidArgument(
5555
"The dimension of input tensor must be greater than 0."));
5656

5757
int pos_axis = axis;
@@ -61,18 +61,18 @@ std::vector<ir::Tensor> Argmax(const Tensor &in_tensor,
6161
PADDLE_ENFORCE_LT(
6262
pos_axis,
6363
ndim,
64-
phi::errors::InvalidArgument(
64+
::common::errors::InvalidArgument(
6565
"The axis must be less than the dimension of input tensor."));
6666
PADDLE_ENFORCE_GE(pos_axis,
6767
0,
68-
phi::errors::InvalidArgument(
68+
::common::errors::InvalidArgument(
6969
"The axis must be greater than or equal to 0."));
7070

7171
std::vector<Expr> output_shape;
7272
for (int i = 0; i < shape.size(); ++i) {
7373
PADDLE_ENFORCE_EQ(shape[i].is_constant(),
7474
true,
75-
phi::errors::InvalidArgument(
75+
::common::errors::InvalidArgument(
7676
"Input tensor's shape should be constant value."));
7777
if (pos_axis == i) {
7878
if (keep_dims) {
@@ -126,28 +126,28 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmax(
126126
PADDLE_ENFORCE_EQ(
127127
!args.empty(),
128128
true,
129-
phi::errors::InvalidArgument(
129+
::common::errors::InvalidArgument(
130130
"The input argument of argmax compute is empty! Please check."));
131131
cinn::common::CINNValuePack pack_args = args[0];
132132
std::string tensor_name = UniqName("Argmax_out");
133133
PADDLE_ENFORCE_GE(pack_args.size(),
134134
1U,
135-
phi::errors::InvalidArgument(
135+
::common::errors::InvalidArgument(
136136
"There should be 1 input args for argmax compute"));
137137
Expr in_expr = pack_args[0];
138138
PADDLE_ENFORCE_NOT_NULL(
139139
in_expr.as_tensor(),
140-
phi::errors::InvalidArgument(
140+
::common::errors::InvalidArgument(
141141
"The input argument of argmax compute is null."));
142142
Tensor in_tensor = in_expr.as_tensor_ref();
143143
PADDLE_ENFORCE_EQ(pack_args.size(),
144144
2U,
145-
phi::errors::InvalidArgument(
145+
::common::errors::InvalidArgument(
146146
"The input argument of argmax compute must be 2."));
147147
PADDLE_ENFORCE_EQ(
148148
pack_args[1].is_string(),
149149
true,
150-
phi::errors::InvalidArgument(
150+
::common::errors::InvalidArgument(
151151
"The input argument of argmax compute must be string."));
152152
tensor_name = pack_args[1].operator std::string();
153153
std::vector<ir::Tensor> out_tensor =
@@ -164,7 +164,7 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmax(
164164
PADDLE_ENFORCE_EQ(
165165
!args.empty(),
166166
true,
167-
phi::errors::InvalidArgument(
167+
::common::errors::InvalidArgument(
168168
"The input argument of argmax_schedule is empty! Please check."));
169169
cinn::common::CINNValuePack arg_pack = args[0];
170170
std::vector<Expr> vec_ast;
@@ -177,7 +177,7 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmax(
177177
PADDLE_ENFORCE_EQ(
178178
!vec_ast.empty(),
179179
true,
180-
phi::errors::InvalidArgument(
180+
::common::errors::InvalidArgument(
181181
"The input argument of argmax_schedule is empty! Please check."));
182182
ir::ModuleExpr mod_expr(vec_ast);
183183
ir::IRSchedule ir_sch(mod_expr);

‎paddle/cinn/hlir/op/contrib/argmin.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ std::vector<Tensor> Argmin(const Tensor &in_tensor,
5151
PADDLE_ENFORCE_GT(
5252
ndim,
5353
0,
54-
phi::errors::InvalidArgument("tensor's dim must be more than 0"));
54+
::common::errors::InvalidArgument("tensor's dim must be more than 0"));
5555

5656
int pos_axis = axis;
5757
if (axis < 0) {
@@ -64,7 +64,7 @@ std::vector<Tensor> Argmin(const Tensor &in_tensor,
6464
for (int i = 0; i < shape.size(); ++i) {
6565
PADDLE_ENFORCE_EQ(shape[i].is_constant(),
6666
true,
67-
phi::errors::InvalidArgument(
67+
::common::errors::InvalidArgument(
6868
"Input tensor's shape should be constant value."));
6969
if (pos_axis == i) {
7070
if (keep_dims) {
@@ -116,22 +116,22 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmin(
116116
PADDLE_ENFORCE_EQ(
117117
!args.empty(),
118118
true,
119-
phi::errors::InvalidArgument(
119+
::common::errors::InvalidArgument(
120120
"The input argument of argmin compute is empty! Please check."));
121121
cinn::common::CINNValuePack pack_args = args[0];
122122
CHECK_GE(pack_args.size(), 1U)
123123
<< "There should be 1 input args for argmax compute";
124124
Expr in_expr = pack_args[0];
125125
PADDLE_ENFORCE_NOT_NULL(
126126
in_expr.as_tensor(),
127-
phi::errors::InvalidArgument(
127+
::common::errors::InvalidArgument(
128128
"The input argument of argmin compute is not tensor."));
129129
Tensor in_tensor = in_expr.as_tensor_ref();
130130
CHECK_EQ(pack_args.size(), 2U);
131131
PADDLE_ENFORCE_EQ(
132132
pack_args[1].is_string(),
133133
true,
134-
phi::errors::InvalidArgument(
134+
::common::errors::InvalidArgument(
135135
"The input argument of argmin compute is not string."));
136136
std::string tensor_name = pack_args[1].operator std::string();
137137
auto out_tensor = Argmin(in_tensor, target, axis, keep_dims, tensor_name);
@@ -147,7 +147,7 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmin(
147147
PADDLE_ENFORCE_EQ(
148148
!args.empty(),
149149
true,
150-
phi::errors::InvalidArgument(
150+
::common::errors::InvalidArgument(
151151
"The input argument of argmin schedule is empty! Please check."));
152152
cinn::common::CINNValuePack arg_pack = args[0];
153153
std::vector<Expr> vec_ast;
@@ -160,7 +160,7 @@ std::shared_ptr<framework::OpStrategy> StrategyForArgmin(
160160
PADDLE_ENFORCE_EQ(
161161
!vec_ast.empty(),
162162
true,
163-
phi::errors::InvalidArgument(
163+
::common::errors::InvalidArgument(
164164
"The input argument of argmin schedule is empty! Please check."));
165165
ir::ModuleExpr mod_expr(vec_ast);
166166
ir::IRSchedule ir_sch(mod_expr);

0 commit comments

Comments
 (0)