Skip to content

Commit

Permalink
fix (#63193)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shuaihehe
shuaihehe authored Apr 3, 2024
1 parent c8471a5 commit af23092
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 15 deletions.
28 changes: 23 additions & 5 deletions paddle/cinn/pybind/framework.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ void BindFramework(pybind11::module *m) {
input_output_names,
key,
target);
CHECK_EQ(funcs.size(), 1U);
PADDLE_ENFORCE_EQ(funcs.size(),
1U,
phi::errors::InvalidArgument(
"The size of funcs is incorrect."
"Expected size is 1, but receive %d.",
funcs.size()));
func = funcs[0];
return func;
});
Expand All @@ -103,8 +108,11 @@ void BindFramework(pybind11::module *m) {
})
.def("get_attr",
[](NodeAttr &self, const std::string &key) {
CHECK_EQ(self.attr_store.count(key), 1)
<< "Didn't find value with key [" << key << "].";
PADDLE_ENFORCE_EQ(self.attr_store.count(key),
1,
phi::errors::InvalidArgument(
"Didn't find value with key [%d].",
self.attr_store.count(key)));
return self.attr_store[key];
})
.def("__str__", [](NodeAttr &self) { return utils::GetStreamCnt(self); });
Expand Down Expand Up @@ -194,12 +202,22 @@ void BindFramework(pybind11::module *m) {
<< "currently only support float32 data type as input";
hlir::framework::shape_t shape;
std::copy_n(array.shape(), array.ndim(), std::back_inserter(shape));
CHECK_EQ(
PADDLE_ENFORCE_EQ(
std::accumulate(shape.begin(),
shape.end(),
1,
[](int32_t a, int32_t b) { return a * b; }),
self->shape().numel());
self->shape().numel(),
phi::errors::InvalidArgument(
"The product of all elements in the shape container and "
"shape numel is not equal,"
"where the product of all elements in the shape "
"container:%d but shape numel:%d.",
std::accumulate(shape.begin(),
shape.end(),
1,
[](int32_t a, int32_t b) { return a * b; }),
self->shape().numel()));
auto *data = self->mutable_data(target, self->type());
if (target.arch == Target::Arch::X86) {
std::memcpy(data,
Expand Down
27 changes: 18 additions & 9 deletions paddle/cinn/pybind/frontend.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,12 @@ void BindFrontend(pybind11::module *m) {
auto in_tensor = scope->GetTensor(tensor_inputs[i]->id);
auto dtype = tensor_inputs[i]->type;
auto *data = in_tensor->mutable_data(target, dtype);
CHECK_EQ(input_data[i].size(), in_tensor->shape().numel())
<< "The size of tensor [" << tensor_inputs[i]->id
<< "] is different with the input data's size! Please check.";
PADDLE_ENFORCE_EQ(input_data[i].size(),
in_tensor->shape().numel(),
phi::errors::InvalidArgument(
"The size of tensor [%d] is different with "
"the input data's size! Please check.",
tensor_inputs[i]->id));
if (target.arch == Target::Arch::NVGPU) {
#ifdef CINN_WITH_CUDA
CUDA_CALL(cudaMemcpy(data,
Expand Down Expand Up @@ -314,9 +317,12 @@ void BindFrontend(pybind11::module *m) {
for (size_t i = 0; i < tensor_inputs.size(); i++) {
auto in_tensor = scope->GetTensor(tensor_inputs[i]->id);
auto *data = in_tensor->mutable_data<float>(target);
CHECK_EQ(input_data[i].size(), in_tensor->shape().numel())
<< "The size of tensor [" << tensor_inputs[i]->id
<< "] is different with the input data's size! Please check.";
PADDLE_ENFORCE_EQ(input_data[i].size(),
in_tensor->shape().numel(),
phi::errors::InvalidArgument(
"The size of tensor [%d] is different with "
"the input data's size! Please check.",
tensor_inputs[i]->id));
if (target.arch == Target::Arch::NVGPU) {
#ifdef CINN_WITH_CUDA
CUDA_CALL(cudaMemcpy(reinterpret_cast<void *>(data),
Expand Down Expand Up @@ -365,9 +371,12 @@ void BindFrontend(pybind11::module *m) {
for (size_t i = 0; i < tensor_inputs.size(); i++) {
auto in_tensor = scope->GetTensor(tensor_inputs[i]->id);
auto *data = in_tensor->mutable_data<float>(target);
CHECK_EQ(input_data[i].size(), in_tensor->shape().numel())
<< "The size of tensor [" << tensor_inputs[i]->id
<< "] is different with the input data's size! Please check.";
PADDLE_ENFORCE_EQ(input_data[i].size(),
in_tensor->shape().numel(),
phi::errors::InvalidArgument(
"The size of tensor [%d] is different with "
"the input data's size! Please check.",
tensor_inputs[i]->id));
if (target.arch == Target::Arch::NVGPU) {
#ifdef CINN_WITH_CUDA
CUDA_CALL(cudaMemcpy(reinterpret_cast<void *>(data),
Expand Down
9 changes: 8 additions & 1 deletion paddle/cinn/pybind/ir/ir.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ void TensorStore(Expr tensor, Expr value, const std::vector<Expr>& indices) {
std::vector<Expr> AxisMap(const std::string& kinds,
const std::vector<Expr>& iter_expression) {
std::vector<Expr> rets;
CHECK_EQ(kinds.size(), iter_expression.size());
PADDLE_ENFORCE_EQ(
kinds.size(),
iter_expression.size(),
phi::errors::InvalidArgument(
"The size of kinds and iter expression in AxisMap is not equal,"
"where kinds size:%d but iter expression size:%d.",
kinds.size(),
iter_expression.size()));
int n = iter_expression.size();
rets.reserve(n);
for (int i = 0; i < n; i++) {
Expand Down

0 comments on commit af23092

Please sign in to comment.