Fix: [RELAX][FRONTEND][Resolved from_onnx import issue #18008]

.pre-commit-config.yaml

@@ -34,7 +34,7 @@
 default_language_version:
     python: python3.6
 fail_fast: True
-default_stages: [push]
+default_stages: [pre-push]
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v2.3.0
@@ -43,9 +43,9 @@ repos:
         - id: check-merge-conflict
         - id: check-yaml
         - id: end-of-file-fixer
-          stages: [push]
+          stages: [pre-push]
         - id: trailing-whitespace
-          stages: [push]
+          stages: [pre-push]
     - repo: local
       hooks:
         -   id: run-black

python/tvm/relax/frontend/__init__.py

@@ -15,5 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 """Frontends for constructing Relax programs, with the model importers"""
+
 from . import nn
+<<<<<<< HEAD
+from . common import detach_params
+from . import onnx
+=======
+#from . import onnx
 from .common import detach_params
+>>>>>>> parent of 18b9170d6 (commented-lint)