diff --git a/python/unittest_py/requirements.txt b/python/unittest_py/requirements.txt index 5a59935887bbe46b3e8bbb970402de74542e7686..752f3545c69ccc14cfa2dd823e9dada783602db7 100644 --- a/python/unittest_py/requirements.txt +++ b/python/unittest_py/requirements.txt @@ -10,3 +10,4 @@ scipy>=0.19.0, <=1.2.1 ; python_version<"3.5" scipy<=1.3.1 ; python_version=="3.5" scipy ; python_version>"3.5" prettytable +distro diff --git a/tools/check_op_desc.py b/tools/check_op_desc.py index 15e410401216ce68fc4178bb4e60d3ac159523f4..78abb6f36c60626d2e022e6be017f5dbfa23d2c3 100644 --- a/tools/check_op_desc.py +++ b/tools/check_op_desc.py @@ -17,8 +17,6 @@ import sys from paddle.utils import OpLastCheckpointChecker from paddle.fluid.core import OpUpdateType -SAME = 0 - INPUTS = "Inputs" OUTPUTS = "Outputs" ATTRS = "Attrs" @@ -71,7 +69,7 @@ def diff_vars(origin_vars, new_vars): vars_name_only_in_new = set(new_vars.keys()) - set(origin_vars.keys()) for var_name in common_vars_name: - if cmp(origin_vars.get(var_name), new_vars.get(var_name)) == SAME: + if origin_vars.get(var_name) == new_vars.get(var_name): continue else: error, var_error = True, True @@ -120,7 +118,7 @@ def diff_attr(ori_attrs, new_attrs): attrs_only_in_new = set(new_attrs.keys()) - set(ori_attrs.keys()) for attr_name in common_attrs: - if cmp(ori_attrs.get(attr_name), new_attrs.get(attr_name)) == SAME: + if ori_attrs.get(attr_name) == new_attrs.get(attr_name): continue else: error, attr_error = True, True @@ -184,7 +182,7 @@ def compare_op_desc(origin_op_desc, new_op_desc): new = json.loads(new_op_desc) desc_error_message = {} version_error_message = {} - if cmp(origin_op_desc, new_op_desc) == SAME: + if origin_op_desc == new_op_desc: return desc_error_message, version_error_message for op_type in origin: diff --git a/tools/summary_env.py b/tools/summary_env.py index 38bae87651d4b24fc7377c65f371995c893fda42..d12e644cc28daa14bc7de879bc295ad7b2fc91e5 100644 --- a/tools/summary_env.py +++ b/tools/summary_env.py @@ -13,6 +13,7 @@ # limitations under the License. import os import sys +import distro import platform import subprocess @@ -47,8 +48,8 @@ def get_os_info(): plat = "macOs" ver = platform.mac_ver()[0] elif platform.system() == "Linux": - plat = platform.linux_distribution()[0] - ver = platform.linux_distribution()[1] + plat = distro.linux_distribution()[0] + ver = distro.linux_distribution()[1] elif platform.system() == "Windows": plat = "Windows" ver = platform.win32_ver()[0]