Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!49763 revise logical ops error message 

Merge pull request !49763 from wtcheng/master
This commit is contained in:
i-robot 2023-03-06 06:33:59 +00:00 committed by Gitee
parent 02c441a9e4 6e824737c9
commit 661ec54dde
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mindspore/core/ops/logical_and.cc
View File

@ -35,13 +35,20 @@ abstract::ShapePtr LogicalAndInferShape(const PrimitivePtr &primitive, const std
}
TypePtr LogicalAndInferType(const PrimitivePtr &prim, const std::vector<AbstractBasePtr> &input_args) {
std::map<std::string, TypePtr> types;
auto infer_dtype = input_args[0]->BuildType();
const std::set<TypePtr> valid_types = {kBool};
(void)types.emplace("x", input_args[0]->BuildType());
(void)types.emplace("y", input_args[1]->BuildType());
(void)CheckAndConvertUtils::CheckTensorTypeSame(types, valid_types, prim->name());
return infer_dtype;
auto x_dtype = input_args[0]->BuildType();
MS_EXCEPTION_IF_NULL(x_dtype);
auto y_dtype = input_args[1]->BuildType();
MS_EXCEPTION_IF_NULL(y_dtype);
const std::basic_string<char> kBool = "Tensor[Bool]";
std::ostringstream buffer;
buffer << "For primitive[LogicalAnd], the input argument[x, y, ] must be a type of {Tensor[Bool], }, but got ";
if (x_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << x_dtype->ToString() << ".";
}
if (y_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << y_dtype->ToString() << ".";
}
return x_dtype;
}
} // namespace

3
mindspore/core/ops/logical_not.cc
View File

@ -40,7 +40,8 @@ TypePtr LogicalNotInferType(const PrimitivePtr &prim, const std::vector<Abstract
auto op_name = prim->name();
MS_EXCEPTION_IF_NULL(input_args[0]);
auto infer_dtype = input_args[0]->BuildType();
(void)CheckAndConvertUtils::CheckTensorTypeValid("x", infer_dtype, common_valid_types_with_complex_and_bool, op_name);
std::set<TypePtr> local_bool = {kBool};
(void)CheckAndConvertUtils::CheckTensorTypeValid("x", infer_dtype, local_bool, op_name);
return kBool;
}
} // namespace

21
mindspore/core/ops/logical_or.cc
View File

@ -35,13 +35,20 @@ abstract::ShapePtr LogicalOrInferShape(const PrimitivePtr &primitive, const std:
}
TypePtr LogicalOrInferType(const PrimitivePtr &prim, const std::vector<AbstractBasePtr> &input_args) {
std::map<std::string, TypePtr> types;
auto infer_dtype = input_args[0]->BuildType();
const std::set<TypePtr> valid_types = {kBool};
(void)types.emplace("x", input_args[0]->BuildType());
(void)types.emplace("y", input_args[1]->BuildType());
(void)CheckAndConvertUtils::CheckTensorTypeSame(types, valid_types, prim->name());
return infer_dtype;
auto x_dtype = input_args[0]->BuildType();
MS_EXCEPTION_IF_NULL(x_dtype);
auto y_dtype = input_args[1]->BuildType();
MS_EXCEPTION_IF_NULL(y_dtype);
const std::basic_string<char> kBool = "Tensor[Bool]";
std::ostringstream buffer;
buffer << "For primitive[LogicalOr], the input argument[x, y, ] must be a type of {Tensor[Bool], }, but got ";
if (x_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << x_dtype->ToString() << ".";
}
if (y_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << y_dtype->ToString() << ".";
}
return x_dtype;
}
} // namespace

19
mindspore/core/ops/logical_xor.cc
View File

@ -33,11 +33,20 @@ abstract::ShapePtr LogicalXorInferShape(const PrimitivePtr &primitive, const std
}
TypePtr LogicalXorInferType(const PrimitivePtr &prim, const std::vector<AbstractBasePtr> &input_args) {
std::map<std::string, TypePtr> types;
const std::set<TypePtr> valid_types = {kBool};
(void)types.emplace("x", input_args[0]->BuildType());
(void)types.emplace("y", input_args[1]->BuildType());
return CheckAndConvertUtils::CheckTensorTypeSame(types, valid_types, prim->name());
auto x_dtype = input_args[0]->BuildType();
MS_EXCEPTION_IF_NULL(x_dtype);
auto y_dtype = input_args[1]->BuildType();
MS_EXCEPTION_IF_NULL(y_dtype);
const std::basic_string<char> kBool = "Tensor[Bool]";
std::ostringstream buffer;
buffer << "For primitive[LogicalXor], the input argument[x, y, ] must be a type of {Tensor[Bool], }, but got ";
if (x_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << x_dtype->ToString() << ".";
}
if (y_dtype->ToString() != kBool) {
MS_EXCEPTION(TypeError) << buffer.str() << y_dtype->ToString() << ".";
}
return x_dtype;
}
} // namespace