pgjmblvch
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add dict for isinstance

This commit is contained in:
buxue 2021-01-21 14:12:50 +08:00
parent da92f1affb
commit 2ea8b9e738
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mindspore/_extends/parse/standard_method.py
View File

@ -362,6 +362,7 @@ def check_type_same(x_type, base_type):
str: mstype.String,
list: mstype.List,
tuple: mstype.Tuple,
dict: mstype.Dict,
Tensor: mstype.tensor_type,
Parameter: mstype.ref_type
}
@ -371,11 +372,14 @@ def check_type_same(x_type, base_type):
if isinstance(base_type, tuple):
target_type = tuple(pytype_to_mstype[i] for i in base_type)
else:
target_type = pytype_to_mstype[base_type]
target_type = (pytype_to_mstype[base_type],)
if (isinstance(x_type, mstype.Bool) and mstype.Int in target_type) or \
(isinstance(x_type, mstype.ref_type) and mstype.tensor_type in target_type):
return True
return isinstance(x_type, target_type)
except KeyError:
raise TypeError(f"The second arg of 'isinstance' should be bool, int, float, str, list, tuple, "
f"Tensor, Parameter, or a tuple only including these types, but got {base_type}")
f"Tensor, Parameter, or a tuple containing only these types, but got {base_type}")
@constexpr

3
mindspore/ccsrc/pybind_api/ir/dtype_py.cc
View File

@ -115,6 +115,9 @@ REGISTER_PYBIND_DEFINE(
(void)py::class_<Tuple, Type, std::shared_ptr<Tuple>>(m_sub, "Tuple")
.def(py::init())
.def(py::init<std::vector<TypePtr>>(), py::arg("elements"));
(void)py::class_<Dictionary, Type, std::shared_ptr<Dictionary>>(m_sub, "Dict")
.def(py::init())
.def(py::init<std::vector<std::pair<std::string, TypePtr>>>(), py::arg("key_values"));
(void)py::class_<TensorType, Type, std::shared_ptr<TensorType>>(m_sub, "TensorType")
.def(py::init())
.def(py::init<TypePtr>(), py::arg("element"))

1
mindspore/common/dtype.py
View File

@ -104,6 +104,7 @@ Bool = typing.Bool
String = typing.String
List = typing.List
Tuple = typing.Tuple
Dict = typing.Dict
Slice = typing.Slice
function_type = typing.Function
Ellipsis_ = typing.TypeEllipsis

18
tests/ut/python/pipeline/parse/test_isinstance.py
View File

@ -36,19 +36,26 @@ def test_isinstance():
self.list_member = list(self.tuple_member)
self.weight = Parameter(1.0)
self.empty_list = []
self.dict_member = {"x": Tensor(np.arange(4)), "y": Tensor(np.arange(5))}
self.empty_dict = {}
def construct(self, x, y):
is_int = isinstance(self.int_member, int)
is_float = isinstance(self.float_member, float)
is_bool = isinstance(self.bool_member, bool)
bool_is_int = isinstance(self.bool_member, int)
is_string = isinstance(self.string_member, str)
is_parameter = isinstance(self.weight, Parameter)
parameter_is_tensor = isinstance(self.weight, Tensor)
is_tensor_const = isinstance(self.tensor_member, Tensor)
is_tensor_var = isinstance(x, Tensor)
is_tuple_const = isinstance(self.tuple_member, tuple)
is_tuple_var = isinstance((x, 1, 1.0, y), tuple)
is_list_const = isinstance(self.list_member, list)
is_list_var = isinstance([x, 1, 1.0, y], list)
is_dict_const = isinstance(self.dict_member, dict)
is_dict_var = isinstance({"x": x, "y": y}, dict)
is_empty_dic = isinstance(self.empty_dict, dict)
is_list_or_tensor = isinstance([x, y], (Tensor, list))
is_int_or_float_or_tensor_or_tuple = isinstance(x, (Tensor, tuple, int, float))
float_is_int = isinstance(self.float_member, int)
@ -56,16 +63,17 @@ def test_isinstance():
tensor_is_tuple = isinstance(x, tuple)
tuple_is_list = isinstance(self.tuple_member, list)
is_empty_list = isinstance(self.empty_list, list)
return is_int, is_float, is_bool, is_string, \
is_empty_list, is_parameter, is_tensor_const, is_tensor_var, \
is_tuple_const, is_tuple_var, is_list_const, is_list_var, \
return is_int, is_float, is_bool, bool_is_int, is_string, is_parameter, \
parameter_is_tensor, is_tensor_const, is_tensor_var, \
is_tuple_const, is_tuple_var, is_list_const, is_list_var, is_empty_list, \
is_dict_const, is_dict_var, is_empty_dic, \
is_int_or_float_or_tensor_or_tuple, is_list_or_tensor, \
float_is_int, bool_is_string, tensor_is_tuple, tuple_is_list
net = Net()
x = Tensor(np.arange(4))
y = Tensor(np.arange(5))
assert net(x, y) == (True,) * 14 + (False,) * 4
assert net(x, y) == (True,) * 19 + (False,) * 4
def test_isinstance_not_supported():
@ -81,7 +89,7 @@ def test_isinstance_not_supported():
with pytest.raises(TypeError) as err:
net()
assert "The second arg of 'isinstance' should be bool, int, float, str, list, tuple, Tensor, Parameter, " \
"or a tuple only including these types, but got None" in str(err.value)
"or a tuple containing only these types, but got None" in str(err.value)
def test_isinstance_second_arg_is_list():