From 457a1e010c3fcea86211357eadf4dd44f94040c1 Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Fri, 3 Jul 2020 16:14:51 +0800
Subject: [PATCH] refactor(imperative): initial merge of xxx and megengine

GitOrigin-RevId: 48a48f5c7f93c3c11c7d2897e8ebfd64694859fc
---
 CMakeLists.txt                | 12 ++++++------
 dnn/scripts/gen_param_defs.py |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca7dcc5..b753bd0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -619,14 +619,14 @@ elseif(TARGET _xxx)
     add_custom_target(
         develop
         COMMAND ${CMAKE_COMMAND} -E create_symlink
-          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/$<TARGET_FILE_NAME:${MODULE_NAME}>
-          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/$<TARGET_FILE_NAME:${MODULE_NAME}>
+          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/core/$<TARGET_FILE_NAME:${MODULE_NAME}>
+          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/core/$<TARGET_FILE_NAME:${MODULE_NAME}>
         COMMAND ${CMAKE_COMMAND} -E create_symlink
-          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/ops/_internal/generated_ops.py
-          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/ops/_internal/generated_ops.py
+          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/core/ops/_internal/generated_ops.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/core/ops/_internal/generated_ops.py
         COMMAND ${CMAKE_COMMAND} -E create_symlink
-          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/ops/_internal/param_defs.py
-          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/ops/_internal/param_defs.py
+          ${CMAKE_CURRENT_BINARY_DIR}/imperative/python/${PACKAGE_NAME}/core/ops/_internal/param_defs.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/imperative/python/${PACKAGE_NAME}/core/ops/_internal/param_defs.py
         DEPENDS _xxx
         VERBATIM
     )
diff --git a/dnn/scripts/gen_param_defs.py b/dnn/scripts/gen_param_defs.py
index a48f3df7..8c0949a2 100755
--- a/dnn/scripts/gen_param_defs.py
+++ b/dnn/scripts/gen_param_defs.py
@@ -359,14 +359,14 @@ class PyWriter(IndentWriterBase):
         else:
             self._write(
                 'def _as_dtype_num(dtype):\n'
-                '    import xxx._xxx.utils as m\n'
+                '    import megengine.core._xxx.utils as m\n'
                 '    return m._get_dtype_num(dtype)\n'
                 '\n'
             )
 
             self._write(
                 'def _as_serialized_dtype(dtype):\n'
-                '    import xxx._xxx.utils as m\n'
+                '    import megengine.core._xxx.utils as m\n'
                 '    return m._get_serialized_dtype(dtype)\n'
                 '\n'
             )
-- 
GitLab