Revert "Fix import in other file"

This reverts commit ab56f1ced6.

python-package/insightface/__init__.py

@@ -4,12 +4,18 @@
 from __future__ import absolute_import
 
 try:
+    #import mxnet as mx
     import onnxruntime
 except ImportError:
     raise ImportError(
         "Unable to import dependency onnxruntime. "
     )
 
-__version__ = '0.4.2'
+__version__ = '0.4'
+
+from . import model_zoo
+from . import utils
+from . import app
+from . import data
+from . import thirdparty
 
-from . import app, data, model_zoo, thirdparty, utils

python-package/insightface/app/mask_renderer.py

@@ -1,18 +1,14 @@
-import datetime
-import os
-import os.path as osp
-import sys
-
-import albumentations as A
-import cv2
+import os, sys, datetime
 import numpy as np
+import os.path as osp
+import albumentations as A
 from albumentations.core.transforms_interface import ImageOnlyTransform
-
-from ..data.image import get_image as ins_get_image
-from ..thirdparty import face3d
-from ..utils import DEFAULT_MP_NAME, get_model_dir
 from .face_analysis import FaceAnalysis
-
+from ..utils import get_model_dir
+from ..thirdparty import face3d
+from ..data import get_image as ins_get_image
+from ..utils import DEFAULT_MP_NAME
+import cv2
 
 class MaskRenderer:
     def __init__(self, name=DEFAULT_MP_NAME, root='~/.insightface', insfa=None):

python-package/insightface/commands/rec_add_mask_param.py

@@ -1,14 +1,13 @@
 
-import numbers
-import os
 from argparse import ArgumentParser, Namespace
 
+import os
 import mxnet as mx
 import numpy as np
-
-from ..app import MaskRenderer
-from ..data.rec_builder import RecBuilder
+import numbers
 from . import BaseInsightFaceCLICommand
+from ..app import MaskRenderer
+from ..data import RecBuilder
 
 
 def rec_add_mask_param_command_factory(args: Namespace):