leap-model-parser 0.1.123.dev3__py3-none-any.whl → 0.1.124__py3-none-any.whl

leap_model_parser/contract/nodedata.py

@@ -1,7 +1,7 @@
-from typing import List
-from enum import Enum
 from dataclasses import dataclass
+from typing import List
 from typing import Union
+from enum import Enum
 
 
 class ActivationsEnum(Enum):
@@ -203,10 +203,8 @@ class NodeType(Enum):
     SGD = "SGD"
     OnnxAbs = "OnnxAbs"
     OnnxErf = "OnnxErf"
-    OnnxGRU = "OnnxGRU"
     OnnxHardSigmoid = "OnnxHardSigmoid"
     OnnxLSTM = "OnnxLSTM"
-    OnnxRNN = "OnnxRNN"
     OnnxReduceMean = "OnnxReduceMean"
     OnnxSqrt = "OnnxSqrt"
     Dataset = "Dataset"
@@ -1803,15 +1801,6 @@ class OnnxErf:
     type: NodeType
 
 
-@dataclass
-class OnnxGRU:
-    units: int
-    return_sequences: bool
-    return_state: bool
-    bidirectional: bool
-    type: NodeType
-
-
 @dataclass
 class OnnxHardSigmoid:
     alpha: float
@@ -1827,16 +1816,6 @@ class OnnxLSTM:
     type: NodeType
 
 
-@dataclass
-class OnnxRNN:
-    units: int
-    return_sequences: bool
-    return_state: bool
-    bidirectional: bool
-    activation: ActivationsEnum
-    type: NodeType
-
-
 @dataclass
 class OnnxReduceMean:
     axes: List[int]
@@ -1951,7 +1930,7 @@ class NodeDataTypes:
                  ZeroPadding1D, ZeroPadding2D, ZeroPadding3D, BinaryCrossentropy, BinaryFocalCrossentropy, 
                  CategoricalCrossentropy, CategoricalHinge, CosineSimilarity, Hinge, Huber, KLDivergence, LogCosh, 
                  MeanAbsoluteError, MeanAbsolutePercentageError, MeanSquaredError, MeanSquaredLogarithmicError, Poisson, 
-                 SquaredHinge, Adadelta, Adagrad, Adam, Adamax, Ftrl, Nadam, RMSprop, SGD, OnnxAbs, OnnxErf, OnnxGRU, 
-                 OnnxHardSigmoid, OnnxLSTM, OnnxRNN, OnnxReduceMean, OnnxSqrt, Dataset, Input, RepresentationBlock, 
-                 GroundTruth, CustomLayer, CustomLoss, Visualizer, Metric, Lambda, TFOpLambda, SlicingOpLambda, Repeat, 
-                 Variable, Gather, FixedDropout]
+                 SquaredHinge, Adadelta, Adagrad, Adam, Adamax, Ftrl, Nadam, RMSprop, SGD, OnnxAbs, OnnxErf, 
+                 OnnxHardSigmoid, OnnxLSTM, OnnxReduceMean, OnnxSqrt, Dataset, Input, RepresentationBlock, GroundTruth, 
+                 CustomLayer, CustomLoss, Visualizer, Metric, Lambda, TFOpLambda, SlicingOpLambda, Repeat, Variable, 
+                 Gather, FixedDropout]

leap_model_parser/contract/ui_components.json

@@ -14509,80 +14509,6 @@
         "properties": [],
         "options": null
     },
-    {
-        "type": "Layer",
-        "shape_calc": [
-            "IdentityFunc"
-        ],
-        "receptive_fields_func": "IdentityReceptiveFieldsFunc",
-        "menu_sections": [
-            "Layer",
-            "Onnx"
-        ],
-        "inputs_data": {
-            "add_input_by_drag": false,
-            "inputs": [
-                {
-                    "name": "input",
-                    "approval_connection": [
-                        "Input",
-                        "Dataset",
-                        "Layer",
-                        "CustomLayer"
-                    ]
-                },
-                {
-                    "name": "initial_h_state",
-                    "approval_connection": [
-                        "Input",
-                        "Dataset",
-                        "Layer",
-                        "CustomLayer"
-                    ]
-                }
-            ]
-        },
-        "outputs_data": {
-            "outputs": [
-                {
-                    "name": "feature_map"
-                }
-            ]
-        },
-        "name": "OnnxGRU",
-        "parents": [
-            "onnx2kerastl",
-            "customonnxlayer",
-            "onnxgru"
-        ],
-        "properties": [
-            {
-                "name": "units",
-                "isdefault": false,
-                "default_val": null,
-                "type": "int"
-            },
-            {
-                "name": "return_sequences",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            },
-            {
-                "name": "return_state",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            },
-            {
-                "name": "bidirectional",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            }
-        ],
-        "options": null
-    },
     {
         "type": "Layer",
         "shape_calc": [
@@ -14713,100 +14639,6 @@
         ],
         "options": null
     },
-    {
-        "type": "Layer",
-        "shape_calc": [
-            "IdentityFunc"
-        ],
-        "receptive_fields_func": "IdentityReceptiveFieldsFunc",
-        "menu_sections": [
-            "Layer",
-            "Onnx"
-        ],
-        "inputs_data": {
-            "add_input_by_drag": false,
-            "inputs": [
-                {
-                    "name": "input",
-                    "approval_connection": [
-                        "Input",
-                        "Dataset",
-                        "Layer",
-                        "CustomLayer"
-                    ]
-                },
-                {
-                    "name": "initial_h_state",
-                    "approval_connection": [
-                        "Input",
-                        "Dataset",
-                        "Layer",
-                        "CustomLayer"
-                    ]
-                }
-            ]
-        },
-        "outputs_data": {
-            "outputs": [
-                {
-                    "name": "feature_map"
-                }
-            ]
-        },
-        "name": "OnnxRNN",
-        "parents": [
-            "onnx2kerastl",
-            "customonnxlayer",
-            "onnxRNN"
-        ],
-        "properties": [
-            {
-                "name": "units",
-                "isdefault": false,
-                "default_val": null,
-                "type": "int"
-            },
-            {
-                "name": "return_sequences",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            },
-            {
-                "name": "return_state",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            },
-            {
-                "name": "bidirectional",
-                "isdefault": false,
-                "default_val": null,
-                "type": "bool"
-            },
-            {
-                "name": "activation",
-                "isdefault": false,
-                "default_val": null,
-                "type": "select",
-                "values": [
-                    "relu",
-                    "softmax",
-                    "selu",
-                    "softplus",
-                    "softsign",
-                    "tanh",
-                    "sigmoid",
-                    "hard_sigmoid",
-                    "exponential",
-                    "linear",
-                    "elu",
-                    "swish"
-                ]
-            }
-        ],
-        "options": null
-    },
     {
         "type": "Layer",
         "shape_calc": [

leap_model_parser/keras_json_model_import.py

@@ -191,8 +191,6 @@ class KerasJsonModelImport:
             return [KerasJsonModelImport._serialize_arg(a) for a in arg]
         if isinstance(arg, dict):
             return {k: KerasJsonModelImport._serialize_arg(v) for k, v in arg.items()}
-        if isinstance(arg, type(Ellipsis)):
-            return f'{nojsonable_arg_serialization_prefix}{str(arg)}'
         raise Exception('Unsupported call arg')
 
     @staticmethod
@@ -252,9 +250,9 @@ class KerasJsonModelImport:
         if 'selected' in layer_metadata:
             layer_config["selected"] = layer_metadata['selected']
         # TODO: remove this hard coded condition after support
-        # if layer_config.get('return_state'):
-        #     raise Exception(f"{layer_metadata.get('name')} layer with return_state True is not supported,"
-        #                     f" please try to contact Tensorleap support")
+        if layer_config.get('return_state'):
+            raise Exception(f"{layer_metadata.get('name')} layer with return_state True is not supported,"
+                            f" please try to contact Tensorleap support")
 
     def generate_rp_node(self, layer: Dict[str, Any], layer_metadata: Dict[str, Any], node_key: str) -> None:
         if layer['name'] not in self.nodes_cache:

{leap_model_parser-0.1.123.dev3.dist-info → leap_model_parser-0.1.124.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.123.dev3
+Version: 0.1.124
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -16,7 +16,7 @@ Requires-Dist: keras-data-format-converter (==0.1.16)
 Requires-Dist: leap-model-rebuilder (==0.1.5)
 Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: onnx (==1.10.1)
-Requires-Dist: onnx2kerastl (==0.0.114.dev2)
+Requires-Dist: onnx2kerastl (==0.0.115)
 Requires-Dist: tensorflow (==2.11.0) ; platform_machine == "x86_64"
 Requires-Dist: tensorflow-macos (==2.11.0) ; platform_machine == "arm64"
 Project-URL: Repository, https://github.com/tensorleap/leap-model-parser

{leap_model_parser-0.1.123.dev3.dist-info → leap_model_parser-0.1.124.dist-info}/RECORD

@@ -3,9 +3,9 @@ leap_model_parser/__init__.py,sha256=OAU7rFHAVVWUM-cDtQ4Ohum567KN8M-YTkHZp5KiYbo
 leap_model_parser/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/contract/graph.py,sha256=c5rSlJJQ3JzLhyeniglzrP5GH0fp8UZDQKZw1fcrNe8,1132
 leap_model_parser/contract/importmodelresponse.py,sha256=GlvnKS8xrebU2Sj0dxqtEhAOOo3DlOtT7AMJ2BlzH9E,145
-leap_model_parser/contract/nodedata.py,sha256=vY855Gkk9J_W6vgFjQgt1YdqINpEgvbymGDbbJqwdYk,43696
-leap_model_parser/contract/ui_components.json,sha256=VOwTd2KZ0RAhHnUnqWxhYmezhjJDJxAHHyQdgKrhZQA,420821
-leap_model_parser/keras_json_model_import.py,sha256=INdcTkf5dSHOAaXStcSIIuk8azMwdX1sqzwCJ3pqjRs,16666
+leap_model_parser/contract/nodedata.py,sha256=1_ML0nzp3QUZ0_9mGSLhfO4_hqjYMwi0DWLwymUnWEs,43326
+leap_model_parser/contract/ui_components.json,sha256=lhKWOQjvGCxQakDcNHq7aBmORUf67ZodZcCtJ_TIcsI,416303
+leap_model_parser/keras_json_model_import.py,sha256=f3ISFoiXPgxzIXAxvbiIKyxcvq4Z-Xv8X0O2I9BQA5k,16546
 leap_model_parser/model_parser.py,sha256=_Zwb9LA0v8EshQJc2IQ0LwXyxonueeMasAMs0zfF4CQ,6738
 leap_model_parser/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,8 +16,8 @@ leap_model_parser/utils/uicomponents/__init__.py,sha256=ShNUN5NLzaxOQ5ByNUUWJG6v
 leap_model_parser/utils/uicomponents/generatenodedata.py,sha256=LRaPlO5jJ9pUtkvLG9QaGBRnu860wNH_OkBM6UKLGGQ,3035
 leap_model_parser/utils/uicomponents/tensorflowinscpection.py,sha256=ym613z9iQKPDBpr0RYD35bTABdm1L-Ez86G47BYT7qw,6775
 leap_model_parser/utils/uicomponents/ui_components_config.yaml,sha256=nzhcSR-00erM-D09CczOmfF4a6w9kZUgDjDksHtLsUo,19604
-leap_model_parser-0.1.123.dev3.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.123.dev3.dist-info/METADATA,sha256=8H6PX_he-FwtGGoDAVXe98KG3qoEWlaY42UDcCFuSGg,1020
-leap_model_parser-0.1.123.dev3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-leap_model_parser-0.1.123.dev3.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.123.dev3.dist-info/RECORD,,
+leap_model_parser-0.1.124.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.124.dist-info/METADATA,sha256=eGY5iKVapRHkOvU_e0ULp1eC84kDK-kUiumP-HC3qP0,1010
+leap_model_parser-0.1.124.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+leap_model_parser-0.1.124.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.124.dist-info/RECORD,,

{leap_model_parser-0.1.123.dev3.dist-info → leap_model_parser-0.1.124.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any