commit 8cab7994a6e92b9b37e324be493c04e4660dc330
author Bin Bao <binbao@fb.com> Mon May 22 22:37:04 2023 +0000
committer PyTorch MergeBot <pytorchmergebot@users.noreply.github.com> Tue May 23 03:59:55 2023 +0000
tree 1b4a64eec398cb5b0876db18a0dac7b192b774b3
parent 2bce7c8f46530859450fbc2c61f7e22eb7cc938a

[inductor] Move cpp wrapper dynamic shapes test to test_cpp_wrapper (#102017)

Pull Request resolved: https://github.com/pytorch/pytorch/pull/102017
Approved by: https://github.com/ngimel, https://github.com/jansel

test/inductor/test_cpp_wrapper.py

diff --git a/test/inductor/test_cpp_wrapper.py b/test/inductor/test_cpp_wrapper.py
index e85e220..7289da9 100644
--- a/test/inductor/test_cpp_wrapper.py
+++ b/test/inductor/test_cpp_wrapper.py
@@ -16,11 +16,17 @@
 
 try:
     try:
-        from . import test_cpu_repro, test_mkldnn_pattern_matcher, test_torchinductor
+        from . import (
+            test_cpu_repro,
+            test_mkldnn_pattern_matcher,
+            test_torchinductor,
+            test_torchinductor_dynamic_shapes,
+        )
     except ImportError:
         import test_cpu_repro
         import test_mkldnn_pattern_matcher
         import test_torchinductor
+        import test_torchinductor_dynamic_shapes
 except unittest.SkipTest:
     if __name__ == "__main__":
         sys.exit(0)
@@ -43,10 +49,18 @@
     device = "cpu"
 
 
+class DynamicShapesCppWrapperCpuTests(TorchTestCase):
+    device = "cpu"
+
+
 class TestCudaWrapper(TorchTestCase):
     device = "cuda"
 
 
+class DynamicShapesCudaWrapperCudaTests(TorchTestCase):
+    device = "cuda"
+
+
 def make_test_case(name, device, tests, condition=True):
     test_name = f"{name}_{device}" if device else name
 
@@ -115,6 +129,16 @@
 
     test_torchinductor.copy_tests(CppWrapperTemplate, TestCppWrapper, "cpp_wrapper")
 
+    DynamicShapesCppWrapperTemplate = (
+        test_torchinductor_dynamic_shapes.make_dynamic_cls(CppWrapperTemplate)
+    )
+
+    test_torchinductor.copy_tests(
+        DynamicShapesCppWrapperTemplate,
+        DynamicShapesCppWrapperCpuTests,
+        "cpp_wrapper",
+    )
+
 if RUN_CUDA:
 
     class BaseTest(NamedTuple):
@@ -151,6 +175,18 @@
 
     test_torchinductor.copy_tests(CudaWrapperTemplate, TestCudaWrapper, "cuda_wrapper")
 
+    """
+    # To be enabled
+    DynamicShapesCudaWrapperTemplate = (
+        test_torchinductor_dynamic_shapes.make_dynamic_cls(CudaWrapperTemplate)
+    )
+
+    test_torchinductor.copy_tests(
+        DynamicShapesCudaWrapperTemplate,
+        DynamicShapesCudaWrapperCudaTests,
+        "cuda_wrapper",
+    )
+    """
 
 if __name__ == "__main__":
     from torch._dynamo.test_case import run_tests

test/inductor/test_torchinductor_dynamic_shapes.py

diff --git a/test/inductor/test_torchinductor_dynamic_shapes.py b/test/inductor/test_torchinductor_dynamic_shapes.py
index a0cc5bf..5302ade 100644
--- a/test/inductor/test_torchinductor_dynamic_shapes.py
+++ b/test/inductor/test_torchinductor_dynamic_shapes.py
@@ -33,7 +33,6 @@
 # Make the helper files in test/ importable
 pytorch_test_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 sys.path.append(pytorch_test_dir)
-from inductor.test_cpp_wrapper import CppWrapperTemplate
 from inductor.test_torchinductor import (
     check_model,
     check_model_cuda,
@@ -76,7 +75,6 @@
 
 
 DynamicShapesCommonTemplate = make_dynamic_cls(CommonTemplate)
-DynamicShapesCppWrapperTemplate = make_dynamic_cls(CppWrapperTemplate)
 
 
 if HAS_CPU:
@@ -85,15 +83,7 @@
         common = check_model
         device = "cpu"
 
-    class DynamicShapesCppWrapperCpuTests(TestCase):
-        device = "cpu"
-
     copy_tests(DynamicShapesCommonTemplate, DynamicShapesCpuTests, "cpu", test_failures)
-    copy_tests(
-        DynamicShapesCppWrapperTemplate,
-        DynamicShapesCppWrapperCpuTests,
-        "cpp_wrapper",
-    )
 
 
 if HAS_CUDA and not TEST_WITH_ASAN: