Rebase

Author: srkreddy1238

python/tvm/relax/backend/adreno/clml.py

@@ -134,11 +134,6 @@ def _check_conv2d(context: PatternCheckContext) -> bool:
             if weight_dtype not in ["float32", "float16"]:
                 return False
 
-        if "pad_val" in context.annotated_expr:
-            pad_expr = context.annotated_expr["pad_val"]
-            if 0 != pad_expr.data.numpy():
-                return False
-
         return True
 
     def populate_patterns(patterns, name, op, annotations, *args):
@@ -159,7 +154,6 @@ def conv_pattern():
         bn_bias = is_const()
         bn_mean = is_const()
         bn_var = is_const()
-        pad_val = is_const()
 
         annotations = {
             "data": data,
@@ -173,9 +167,8 @@ def conv_pattern():
         }
 
         pad_annotations = annotations.copy()
-        pad_annotations.update({"pad_val": pad_val})
         patterns["pad.nn.conv2d"] = {
-            "pattern": is_op("relax.nn.conv2d")(is_op("relax.nn.pad")(data, pad_val), weight),
+            "pattern": is_op("relax.nn.conv2d")(is_op("relax.nn.pad")(data), weight),
             "annotation": pad_annotations,
         }
 

python/tvm/relax/backend/adreno/pipeline.py

@@ -23,22 +23,22 @@
 def library_dispatch_passes(target: tvm.target.Target):  # pylint: disable=unused-argument
     """The default library dispatch passes for Adreno GPU backend."""
     if "clml" in target.keys:
-        return [tvm.relax.backend.adreno.clml.OpenCLMLOffLoad()]
+        return [relax.backend.adreno.clml.OpenCLMLOffLoad()]
     else:
         return []
 
 
 def legalize_passes(target: tvm.target.Target):  # pylint: disable=unused-argument
     """The default legalization passes for Adreno GPU backend."""
     return [
-        tvm.relax.transform.DecomposeOpsForInference(),
-        tvm.relax.transform.FoldConstant(),
-        tvm.relax.transform.LegalizeOps(),
-        tvm.relax.transform.AnnotateTIROpPattern(),
-        tvm.relax.transform.FoldConstant(),
-        tvm.relax.transform.FuseOps(),
-        tvm.relax.transform.FuseTIR(),
-        tvm.relax.transform.DeadCodeElimination(),
+        relax.transform.DecomposeOpsForInference(),
+        relax.transform.FoldConstant(),
+        relax.transform.LegalizeOps(),
+        relax.transform.AnnotateTIROpPattern(),
+        relax.transform.FoldConstant(),
+        relax.transform.FuseOps(),
+        relax.transform.FuseTIR(),
+        relax.transform.DeadCodeElimination(),
         dl.ApplyDefaultSchedule(
             dl.gpu.Reduction(),
             dl.gpu.GeneralReduction(),
@@ -49,12 +49,12 @@ def legalize_passes(target: tvm.target.Target):  # pylint: disable=unused-argume
 
 def dataflow_lower_passes(target: tvm.target.Target):  # pylint: disable=unused-argument
     """The default dataflow lowering passes for Adreno GPU backend."""
-    return tvm.relax.backend.gpu_generic.library_dispatch_passes(target)
+    return relax.backend.gpu_generic.library_dispatch_passes(target)
 
 
 def finalize_passes(target: tvm.target.Target):  # pylint: disable=unused-argument
     """The default finalization passes for Adreno GPU backend."""
-    return tvm.relax.backend.gpu_generic.finalize_passes(target)
+    return relax.backend.gpu_generic.finalize_passes(target)
 
 
 def get_default_pipeline(target: tvm.target.Target):

tests/python/relax/backend/clml/conftest.py

@@ -19,7 +19,7 @@
 import sys
 import tvm
 import pytest
-from tvm.autotvm.measure import request_remote
+from tvm import rpc as _rpc
 
 
 @pytest.fixture(scope="session")
@@ -33,6 +33,7 @@ def rpc():
         target_host = "llvm -mtriple=aarch64-linux-gnu"
         device_key = os.getenv("RPC_DEVICE_KEY", "android")
         cross_compile = os.getenv("TVM_NDK_CC", "aarch64-linux-android-g++")
-        return request_remote(device_key, host, port, timeout=1000)
+        tracker = _rpc.connect_tracker(host, port)
+        return tracker.request(device_key, priority=1, session_timeout=1000)
     else:
         return None