frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace blacklist with blocklist in test/run_test.py file. (#42011)

Browse Source 
Summary:
Fixes https://github.com/pytorch/pytorch/issues/41716
test/run_test.py file updated with an appropriate replacement for blacklist and whitelist.

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

Reviewed By: pbelevich

Differential Revision: D22791836

Pulled By: malfet

fbshipit-source-id: 8139649c5b70c876b711e25c33f3051ea8461063
This commit is contained in:
Noman Arshad
2020-07-28 07:51:28 -07:00
committed by Facebook GitHub Bot
parent e179966248
commit 1a8269a566
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/run_test.py
View File

@ -94,7 +94,7 @@ TESTS = [
'distributed/test_ddp_under_dist_autograd',
]
WINDOWS_BLACKLIST = [
WINDOWS_BLOCKLIST = [
'distributed/nn/jit/test_instantiator',
'distributed/nn/api/test_remote_module_spawn',
'distributed/rpc/faulty_agent/test_dist_autograd_spawn',
@ -112,7 +112,7 @@ WINDOWS_BLACKLIST = [
'distributed/test_ddp_under_dist_autograd',
]
ROCM_BLACKLIST = [
ROCM_BLOCKLIST = [
'distributed/nn/jit/test_instantiator',
'distributed/nn/api/test_remote_module_spawn',
'distributed/rpc/faulty_agent/test_dist_autograd_spawn',
@ -135,7 +135,7 @@ ROCM_BLACKLIST = [
'test_openmp',
]
RUN_PARALLEL_BLACKLIST = [
RUN_PARALLEL_BLOCKLIST = [
'test_cpp_extensions_jit',
'test_expecttest',
'test_jit_disabled',
@ -232,7 +232,7 @@ def run_test(executable, test_module, test_directory, options, *extra_unittest_a
unittest_args = options.additional_unittest_args
if options.verbose:
unittest_args.append('--verbose')
if test_module in RUN_PARALLEL_BLACKLIST:
if test_module in RUN_PARALLEL_BLOCKLIST:
unittest_args = [arg for arg in unittest_args if not arg.startswith('--run-parallel')]
# Can't call `python -m unittest test_*` here because it doesn't run code
# in `if __name__ == '__main__': `. So call `python test_*.py` instead.
@ -433,9 +433,9 @@ def parse_args():
' where you want to run all tests, but care more about some set, '
'e.g. after making a change to a specific component')
parser.add_argument(
'--ignore-win-blacklist',
'--ignore-win-blocklist',
action='store_true',
help='always run blacklisted windows tests')
help='always run blocklisted windows tests')
parser.add_argument(
'--determine-from',
help='File of affected source filenames to determine which tests to run.')
@ -527,19 +527,19 @@ def get_selected_tests(options):
selected_tests = exclude_tests(options.exclude, selected_tests)
if sys.platform == 'win32' and not options.ignore_win_blacklist:
if sys.platform == 'win32' and not options.ignore_win_blocklist:
target_arch = os.environ.get('VSCMD_ARG_TGT_ARCH')
if target_arch != 'x64':
WINDOWS_BLACKLIST.append('cpp_extensions_aot_no_ninja')
WINDOWS_BLACKLIST.append('cpp_extensions_aot_ninja')
WINDOWS_BLACKLIST.append('cpp_extensions_jit')
WINDOWS_BLACKLIST.append('jit')
WINDOWS_BLACKLIST.append('jit_fuser')
WINDOWS_BLOCKLIST.append('cpp_extensions_aot_no_ninja')
WINDOWS_BLOCKLIST.append('cpp_extensions_aot_ninja')
WINDOWS_BLOCKLIST.append('cpp_extensions_jit')
WINDOWS_BLOCKLIST.append('jit')
WINDOWS_BLOCKLIST.append('jit_fuser')
selected_tests = exclude_tests(WINDOWS_BLACKLIST, selected_tests, 'on Windows')
selected_tests = exclude_tests(WINDOWS_BLOCKLIST, selected_tests, 'on Windows')
elif TEST_WITH_ROCM:
selected_tests = exclude_tests(ROCM_BLACKLIST, selected_tests, 'on ROCm')
selected_tests = exclude_tests(ROCM_BLOCKLIST, selected_tests, 'on ROCm')
return selected_tests