Merge criterion_tests and new_criterion_tests. (#44398)

Summary:
Pull Request resolved: #44398

These end up executing the same tests, so no reason to have them separate.

Test Plan: Imported from OSS

Reviewed By: mruberry

Differential Revision: D23600855

Pulled By: gchanan

fbshipit-source-id: 0952492771498bf813f1bf8e1d7c8dce574ec965

Author: gchanan

test/test_cpp_api_parity.py

@@ -31,7 +31,6 @@ class TestCppApiParity(common.TestCase):
     (common_nn.module_tests, common_nn.ModuleTest),
     (common_nn.new_module_tests, common_nn.NewModuleTest),
     (common_nn.criterion_tests, common_nn.CriterionTest),
-    (common_nn.new_criterion_tests, common_nn.CriterionTest),
 ]:
     for test_params_dict in test_params_dicts:
         if test_params_dict.get('test_cpp_api_parity', True):

test/test_jit.py

@@ -61,7 +61,7 @@
     get_call, script_template, EXCLUDE_SCRIPT, additional_module_tests, EXCLUDE_SCRIPT_MODULES, \
     get_nn_module_name_from_kwargs, script_method_template, create_traced_fn
 
-from torch.testing._internal.common_nn import module_tests, new_module_tests, criterion_tests, new_criterion_tests
+from torch.testing._internal.common_nn import module_tests, new_module_tests, criterion_tests
 from torch.testing._internal.common_methods_invocations import method_tests as autograd_method_tests
 from torch.testing._internal.common_methods_invocations import create_input, unpack_variables, \
     exclude_tensor_method, EXCLUDE_GRADCHECK, EXCLUDE_FUNCTIONAL
@@ -15831,7 +15831,7 @@ def test_version(self):
 for test in module_tests + new_module_tests + additional_module_tests:
     add_nn_module_test(**test)
 
-for test in criterion_tests + new_criterion_tests:
+for test in criterion_tests:
     test['no_grad'] = True
     add_nn_module_test(**test)
 

test/test_nn.py

@@ -39,7 +39,7 @@
     ALL_TENSORTYPES2, TemporaryFileName, TEST_WITH_UBSAN, IS_PPC
 from torch.testing._internal.common_cuda import TEST_CUDA, TEST_MULTIGPU, TEST_CUDNN, TEST_CUDNN_VERSION
 from torch.testing._internal.common_nn import NNTestCase, NewModuleTest, CriterionTest, \
-    module_tests, criterion_tests, new_criterion_tests, loss_reference_fns, \
+    module_tests, criterion_tests, loss_reference_fns, \
     ctcloss_reference, new_module_tests
 from torch.testing._internal.common_device_type import instantiate_device_type_tests, dtypes, \
     dtypesIfCUDA, skipCUDAIfNoCudnn, skipCUDAIfCudnnVersionLessThan, onlyCUDA, onlyCPU, \
@@ -8753,7 +8753,7 @@ def reference_fn(i, p, m):
 
         add_test(test, decorator)
 
-for test_params in criterion_tests + new_criterion_tests:
+for test_params in criterion_tests:
     name = test_params.pop('module_name')
     test_params['constructor'] = getattr(nn, name)
     test = CriterionTest(**test_params)

torch/testing/_internal/common_nn.py

@@ -4152,9 +4152,6 @@ def padding3d_circular(input, pad):
         desc='margin',
         check_sum_reduction=True,
     ),
-]
-
-new_criterion_tests = [
     dict(
         module_name='BCEWithLogitsLoss',
         input_fn=lambda: torch.rand(15, 10).clamp_(1e-2, 1 - 1e-2),