revert

PINTO0309 · Oct 5, 2022 · d4e3485 · d4e3485
1 parent ff4d2fb
commit d4e3485
Show file tree

Hide file tree

Showing 99 changed files with 113 additions and 113 deletions.
diff --git a/onnx2tf/__init__.py b/onnx2tf/__init__.py
@@ -1,3 +1,3 @@
-from onnx2tf import convert, main
+from onnx2tf.onnx2tf import convert, main
 
 __version__ = '0.0.7'
diff --git a/onnx2tf/onnx2tf.py b/onnx2tf/onnx2tf.py
@@ -28,7 +28,7 @@
 from argparse import ArgumentParser
 
 import importlib
-from utils.colors import Color
+from onnx2tf.utils.colors import Color
 
 def convert(
     input_onnx_file_path: Optional[str] = '',
@@ -176,7 +176,7 @@ def convert(
             graph_input.dtype: dtype('float32')
             graph_input.name: 'input'
             """
-            op = importlib.import_module(f'ops.Input')
+            op = importlib.import_module(f'onnx2tf.ops.Input')
             op.make_node(
                 graph_input=graph_input,
                 tf_layers_dict=tf_layers_dict,
@@ -188,7 +188,7 @@ def convert(
         # https://github.com/onnx/onnx/blob/main/docs/Operators.md
         for graph_node in graph.nodes:
             optype = graph_node.op
-            op = importlib.import_module(f'ops.{optype}')
+            op = importlib.import_module(f'onnx2tf.ops.{optype}')
             op.make_node(
                 graph_node=graph_node,
                 tf_layers_dict=tf_layers_dict,

diff --git a/onnx2tf/ops/Abs.py b/onnx2tf/ops/Abs.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Acos.py b/onnx2tf/ops/Acos.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     alternative_acos,
     get_constant_or_variable,
     print_node_info,

diff --git a/onnx2tf/ops/Acosh.py b/onnx2tf/ops/Acosh.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Add.py b/onnx2tf/ops/Add.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/And.py b/onnx2tf/ops/And.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/ArgMax.py b/onnx2tf/ops/ArgMax.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     convert_axis,
     alternative_argmax,
     get_constant_or_variable,

diff --git a/onnx2tf/ops/ArgMin.py b/onnx2tf/ops/ArgMin.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     convert_axis,
     get_constant_or_variable,
     print_node_info,

diff --git a/onnx2tf/ops/Asin.py b/onnx2tf/ops/Asin.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     alternative_asin,
     get_constant_or_variable,
     print_node_info,

diff --git a/onnx2tf/ops/Asinh.py b/onnx2tf/ops/Asinh.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Atan.py b/onnx2tf/ops/Atan.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Atanh.py b/onnx2tf/ops/Atanh.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/AveragePool.py b/onnx2tf/ops/AveragePool.py
@@ -9,8 +9,8 @@
     AveragePooling2D,
     AveragePooling3D,
 )
-from utils.colors import Color
-from utils.common_functions import (
+from onnx2tf.utils.colors import Color
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     calc_pads_same_pooling,
     pad_input,

diff --git a/onnx2tf/ops/BatchNormalization.py b/onnx2tf/ops/BatchNormalization.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     print_node_info,
     inverted_operation_enable_disable,
 )

diff --git a/onnx2tf/ops/BitShift.py b/onnx2tf/ops/BitShift.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Cast.py b/onnx2tf/ops/Cast.py
@@ -5,8 +5,8 @@
 import tensorflow as tf
 from onnx import TensorProto
 import onnx_graphsurgeon as gs
-from utils.enums import ONNX_DTYPES_TO_TF_DTYPES
-from utils.common_functions import (
+from onnx2tf.utils.enums import ONNX_DTYPES_TO_TF_DTYPES
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Ceil.py b/onnx2tf/ops/Ceil.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Clip.py b/onnx2tf/ops/Clip.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Compress.py b/onnx2tf/ops/Compress.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     convert_axis,
     get_constant_or_variable,
     print_node_info,

diff --git a/onnx2tf/ops/Concat.py b/onnx2tf/ops/Concat.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     convert_axis,
     get_constant_or_variable,
     print_node_info,

diff --git a/onnx2tf/ops/ConcatFromSequence.py b/onnx2tf/ops/ConcatFromSequence.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     convert_axis,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Constant.py b/onnx2tf/ops/Constant.py
@@ -5,8 +5,8 @@
 import tensorflow as tf
 from onnx import numpy_helper
 import onnx_graphsurgeon as gs
-from utils.enums import ONNX_DTYPES_TO_TF_DTYPES
-from utils.common_functions import (
+from onnx2tf.utils.enums import ONNX_DTYPES_TO_TF_DTYPES
+from onnx2tf.utils.common_functions import (
     print_node_info,
 )
 

diff --git a/onnx2tf/ops/ConstantOfShape.py b/onnx2tf/ops/ConstantOfShape.py
@@ -5,7 +5,7 @@
 import tensorflow as tf
 from onnx import numpy_helper
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     print_node_info,
 )
 

diff --git a/onnx2tf/ops/Conv.py b/onnx2tf/ops/Conv.py
@@ -4,14 +4,14 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     get_weights_constant_or_variable,
     get_padding_as_op,
     print_node_info,
     inverted_operation_enable_disable,
 )
-from utils.colors import Color
+from onnx2tf.utils.colors import Color
 
 
 @print_node_info

diff --git a/onnx2tf/ops/Cos.py b/onnx2tf/ops/Cos.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Cosh.py b/onnx2tf/ops/Cosh.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Div.py b/onnx2tf/ops/Div.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Einsum.py b/onnx2tf/ops/Einsum.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Equal.py b/onnx2tf/ops/Equal.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Erf.py b/onnx2tf/ops/Erf.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Exp.py b/onnx2tf/ops/Exp.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Expand.py b/onnx2tf/ops/Expand.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Flatten.py b/onnx2tf/ops/Flatten.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     convert_axis,
     print_node_info,

diff --git a/onnx2tf/ops/Floor.py b/onnx2tf/ops/Floor.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/GatherND.py b/onnx2tf/ops/GatherND.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     convert_axis,
     print_node_info,

diff --git a/onnx2tf/ops/Gemm.py b/onnx2tf/ops/Gemm.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/GlobalAveragePool.py b/onnx2tf/ops/GlobalAveragePool.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/GlobalLpPool.py b/onnx2tf/ops/GlobalLpPool.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/GlobalMaxPool.py b/onnx2tf/ops/GlobalMaxPool.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,

diff --git a/onnx2tf/ops/Greater.py b/onnx2tf/ops/Greater.py
@@ -4,7 +4,7 @@
 np.random.seed(0)
 import tensorflow as tf
 import onnx_graphsurgeon as gs
-from utils.common_functions import (
+from onnx2tf.utils.common_functions import (
     get_constant_or_variable,
     print_node_info,
     inverted_operation_enable_disable,