From a9f98e9c66e1a28fc5030356a02cbe565df96a63 Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Thu, 22 Oct 2020 19:08:18 +0800
Subject: [PATCH] refactor(meg/internal): move interal codes back to megbrain

GitOrigin-RevId: b2dbda96be73e27733bada2858011d2c08b221ff
---
 dnn/scripts/gen_param_defs.py | 4 ++--
 imperative/.gitignore         | 3 ---
 imperative/python/setup.py    | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dnn/scripts/gen_param_defs.py b/dnn/scripts/gen_param_defs.py
index d041c8de..9237f501 100755
--- a/dnn/scripts/gen_param_defs.py
+++ b/dnn/scripts/gen_param_defs.py
@@ -345,14 +345,14 @@ class PyWriter(IndentWriterBase):
         if not self._imperative:
             self._write(
                 'def _as_dtype_num(dtype):\n'
-                '    import megengine._internal.mgb as m\n'
+                '    import megbrain.mgb as m\n'
                 '    return m._get_dtype_num(dtype)\n'
                 '\n'
             )
 
             self._write(
                 'def _as_serialized_dtype(dtype):\n'
-                '    import megengine._internal.mgb as m\n'
+                '    import megbrain.mgb as m\n'
                 '    return m._get_serialized_dtype(dtype)\n'
                 '\n'
             )
diff --git a/imperative/.gitignore b/imperative/.gitignore
index 67074a4e..35794728 100644
--- a/imperative/.gitignore
+++ b/imperative/.gitignore
@@ -1,5 +1,2 @@
 Makefile
 /test/imperative_test
-*.so
-/python/megengine/core/ops/_internal/generated_ops.py
-/python/megengine/core/ops/_internal/param_defs.py
diff --git a/imperative/python/setup.py b/imperative/python/setup.py
index 19c6123c..eb97fe55 100644
--- a/imperative/python/setup.py
+++ b/imperative/python/setup.py
@@ -52,12 +52,12 @@ if local_version:
     __version__ = '{}+{}'.format(__version__, local_version)
 
 packages = find_packages(exclude=['test'])
-package_data = [
+megengine_data = [
     str(f.relative_to('megengine'))
     for f in pathlib.Path('megengine', 'core', 'include').glob('**/*')
 ]
 
-package_data += [
+megengine_data += [
     str(f.relative_to('megengine'))
     for f in pathlib.Path('megengine', 'core', 'lib').glob('**/*')
 ]
@@ -80,7 +80,7 @@ setup_kwargs = dict(
     author_email=email,
     packages=packages,
     package_data={
-        'megengine': package_data,
+        'megengine': megengine_data,
     },
     ext_modules=prebuild_modules,
     install_requires=requires,