OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Enable typechecking of collect_env.py during CI (#43062)

Browse Source 
Summary:
No type annotations can be added to the script, as it still have to be Python-2 compliant.
 Make changes to avoid variable type redefinition.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/43062

Reviewed By: zou3519

Differential Revision: D23132991

Pulled By: malfet

fbshipit-source-id: 360c02e564398f555273e5889a99f834a5467059
This commit is contained in:
Nikita Shulga 2020-08-14 12:44:42 -07:00 committed by Facebook GitHub Bot
parent 1f6d0985d7
commit 64a7684219
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mypy.ini
View File

@ -246,12 +246,6 @@ ignore_errors = True
[mypy-torch.utils.data.distributed]
ignore_errors = True
#[mypy-torch.utils.checkpoint]
#ignore_errors = True
[mypy-torch.utils.collect_env]
ignore_errors = True
[mypy-torch.nn.utils.prune]
ignore_errors = True

18
torch/utils/collect_env.py
View File

@ -39,11 +39,11 @@ def run(command):
"""Returns (return-code, stdout, stderr)"""
p = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True)
output, err = p.communicate()
raw_output, raw_err = p.communicate()
rc = p.returncode
enc = locale.getpreferredencoding()
output = output.decode(enc)
err = err.decode(enc)
output = raw_output.decode(enc)
err = raw_err.decode(enc)
return rc, output.strip(), err.strip()
@ -142,15 +142,15 @@ def get_cudnn_version(run_lambda):
if l is not None and os.path.isfile(l):
return os.path.realpath(l)
return None
files = set()
files_set = set()
for fn in out.split('\n'):
fn = os.path.realpath(fn) # eliminate symbolic links
if os.path.isfile(fn):
files.add(fn)
if not files:
files_set.add(fn)
if not files_set:
return None
# Alphabetize the result because the order is non-deterministic otherwise
files = list(sorted(files))
files = list(sorted(files_set))
if len(files) == 1:
return files[0]
result = '\n'.join(files)
@ -265,8 +265,8 @@ def get_env_info():
if TORCH_AVAILABLE:
version_str = torch.__version__
debug_mode_str = torch.version.debug
cuda_available_str = torch.cuda.is_available()
debug_mode_str = str(torch.version.debug)
cuda_available_str = str(torch.cuda.is_available())
cuda_version_str = torch.version.cuda
else:
version_str = debug_mode_str = cuda_available_str = cuda_version_str = 'N/A'