Revert "[Inductor][ROCm][CK] Enable lowering conv2d instances in CK Inductor backend (pytorch#138643)"

This reverts commit 4d92d6e.

Reverted pytorch#138643 on behalf of https://github.com/wdvr due to reverting due to a large number of internal failures, see below ([comment](pytorch#138643 (comment)))

Author: pytorchmergebot

test/inductor/test_ck_backend.py

@@ -364,44 +364,6 @@ def linear(x_fp8, x_inverse_scale, w_t_fp8, w_inverse_scale, bias):
 
             torch.testing.assert_close(y_eager, y_compiled, rtol=1e-2, atol=0.05)
 
-    @unittest.skipIf(not torch.version.hip, "ROCM only")
-    @unittest.mock.patch.dict(
-        os.environ,
-        {"PATH": _get_path_without_sccache(), "PYTORCH_MIOPEN_SUGGEST_NHWC": "1"},
-    )
-    @parametrize("max_autotune_conv_backends", ("CK", "ATEN,CK,TRITON"))
-    def test_max_autotune_conv2d(self, max_autotune_conv_backends):
-        torch.backends.cuda.matmul.allow_fp16_reduced_precision_reduction = False
-
-        tensor_options = {"device": "cuda", "dtype": torch.float32}
-
-        x = torch.randn(1, 8, 224, 224, **tensor_options)
-        w = torch.randn(64, 8, 7, 7, **tensor_options)
-        x_cl = x.to(memory_format=torch.channels_last)
-        w_cl = w.to(memory_format=torch.channels_last)
-
-        assert "rocm" in dir(config)
-
-        with config.patch(
-            {
-                "max_autotune": True,
-                "autotune_in_subproc": False,
-                "max_autotune_conv_backends": max_autotune_conv_backends,
-                "compile_threads": 4,
-                "rocm.ck_dir": self.ck_dir,
-                "rocm.n_max_profiling_configs": 4,
-            }
-        ):
-
-            @torch.compile(dynamic=False)
-            def conv2d(x, w):
-                return torch.conv2d(x, w)
-
-            Y_eager = torch.conv2d(x_cl, w_cl)
-            Y_compiled = conv2d(x_cl, w_cl)
-
-            torch.testing.assert_close(Y_compiled, Y_eager, atol=2e-4, rtol=2e-4)
-
 
 if __name__ == "__main__":
     from torch._inductor.utils import is_big_gpu

torch/_inductor/kernel/conv.py

@@ -6,7 +6,6 @@
 from typing import cast, List, Optional, Sequence, Tuple, TYPE_CHECKING, TypedDict
 
 import torch
-from torch._inductor.codegen.rocm.ck_conv_template import CKGroupedConvFwdTemplate
 
 from .. import config, ir
 from ..lowering import (
@@ -26,7 +25,6 @@
     is_zeros,
     pad_listlike,
     sympy_product,
-    use_ck_conv_template,
     use_triton_template,
 )
 from ..virtualized import V
@@ -661,17 +659,7 @@ def channels_last_conv():
                     num_warps=cfg.num_warps,
                     **cfg.kwargs,
                 )
-    if use_ck_conv_template(layout):
-        CKGroupedConvFwdTemplate.add_ck_conv_choices(
-            choices,
-            layout,
-            input_nodes=(x, weight) + ((bias,) if bias is not None else tuple()),
-            stride=stride,
-            padding=padding,
-            dilation=dilation,
-            groups=groups,
-            n_spatial_dimensions=ndim,
-        )
+
     return autotune_select_algorithm("convolution", choices, args, layout)