Import statement clean up for Python 3.6 (#1293)

coremltools/converters/mil/backend/mil/load.py

@@ -1,10 +1,15 @@
+#  Copyright (c) 2021, Apple Inc. All rights reserved.
+#
+#  Use of this source code is governed by a BSD-3-clause license that can be
+#  found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause
+
 import logging
 import numpy as _np
 import os
 import tempfile
 
 from coremltools.converters.mil.backend.mil.helper import *
-import coremltools.converters.mil.backend.mil.passes.mil_passes as mil_passes
+from .passes import mil_passes
 import coremltools.proto.MIL_pb2 as pm
 from coremltools.converters.mil.mil import types
 from coremltools.converters.mil.mil import Function

coremltools/converters/mil/backend/nn/load.py

@@ -18,7 +18,7 @@
 )
 from coremltools.models import MLModel
 from coremltools.models import neural_network as neural_network
-import coremltools.models.datatypes as datatypes
+from coremltools.models.datatypes import Array
 from coremltools.converters.mil.mil import types
 from coremltools.converters.mil.mil.types.symbolic import (
     any_symbolic,
@@ -235,9 +235,9 @@ def load(prog, **kwargs):
                     symbolic_inputs[name] = sym_shape
             else:
                 shape = sym_shape
-            v1_inputs.append((name, datatypes.Array(*shape)))
+            v1_inputs.append((name, Array(*shape)))
         elif types.is_scalar(var.sym_type):
-            v1_inputs.append((name, datatypes.Array(1)))
+            v1_inputs.append((name, Array(1)))
         else:
             raise NotImplementedError()