leap-model-parser 0.1.228__py3-none-any.whl → 0.1.232__py3-none-any.whl

leap_model_parser/model_parser.py

@@ -86,12 +86,19 @@ class ModelParser:
 
         graph, connected_inputs = model_generator.generate_graph(
             model_schema, layer_name_to_inbound_nodes)
-
+        # make sure input order is kept with original model
+        input_list = []
+        for inp in keras_model.inputs:
+            name = inp.name
+            name = name.replace(".", "_")
+            for inp_graph in connected_inputs:
+                if inp_graph.name == name:
+                    input_list.append(inp_graph)
         if self.mapping_connections is not None:
             leap_graph_editor = LeapGraphEditor(graph, keras_model_with_weights)
             leap_graph_editor.add_connections_to_graph(self.mapping_connections)
 
-        return graph, connected_inputs, keras_model_with_weights, error_info
+        return graph, input_list, keras_model_with_weights, error_info
 
     def _get_k_model_from_pb_path(self, file_path: str):
         tar_file = tarfile.open(file_path)
@@ -131,7 +138,7 @@ class ModelParser:
         input_all = [_input.name for _input in onnx_model.graph.input]
         input_initializer = [
             node.name for node in onnx_model.graph.initializer]
-        input_names = list(set(input_all) - set(input_initializer))
+        input_names = [name for name in input_all if name not in input_initializer]
         converted_response: ConvertedResponse = onnx_to_keras(onnx_model, input_names=input_names,
                                                               name_policy='attach_weights_name',
                                                               allow_partial_compilation=False)

{leap_model_parser-0.1.228.dist-info → leap_model_parser-0.1.232.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leap-model-parser
-Version: 0.1.228
+Version: 0.1.232
 Summary: 
 License: MIT
 License-File: LICENSE
@@ -13,11 +13,11 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Dist: code-loader (>=1.0.127)
-Requires-Dist: keras-data-format-converter (==0.1.22)
+Requires-Dist: keras-data-format-converter (==0.1.24)
 Requires-Dist: leap-model-rebuilder (==0.1.7)
 Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: onnx (==1.13.0)
-Requires-Dist: onnx2kerastl (==0.0.177)
+Requires-Dist: onnx2kerastl (==0.0.180)
 Requires-Dist: tensorflow (==2.12.0) ; platform_machine == "x86_64"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.34.0)
 Requires-Dist: tensorflow-macos (==2.12.0) ; platform_machine == "arm64"

{leap_model_parser-0.1.228.dist-info → leap_model_parser-0.1.232.dist-info}/RECORD

@@ -6,7 +6,7 @@ leap_model_parser/contract/nodedata.py,sha256=1_ML0nzp3QUZ0_9mGSLhfO4_hqjYMwi0DW
 leap_model_parser/contract/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/keras_json_model_import.py,sha256=h9-eb41W67goutRV5c3VkStxvntgb6EmPFdPeshhtsY,17058
 leap_model_parser/leap_graph_editor.py,sha256=s6iVO06xM6LJ8ZjSxkr1srYxsHhGl2KnQjQoc9g4_iE,14329
-leap_model_parser/model_parser.py,sha256=W8FGKCBOBClIl0sdBlTdoSRT8sIdVrlbO8veNMouJ7o,8169
+leap_model_parser/model_parser.py,sha256=672YTDpQP38439juRr22UbrLG8YQng8HVmMmLVOy1mI,8510
 leap_model_parser/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/layerpedia.py,sha256=1syubfXBTB630TVkgcQ-Ge7Qe9Zbr6EtZRreuqCJnQ8,9292
@@ -17,8 +17,8 @@ leap_model_parser/utils/uicomponents/generatenodedata.py,sha256=LRaPlO5jJ9pUtkvL
 leap_model_parser/utils/uicomponents/tensorflowinscpection.py,sha256=ym613z9iQKPDBpr0RYD35bTABdm1L-Ez86G47BYT7qw,6775
 leap_model_parser/utils/uicomponents/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/utils/uicomponents/ui_components_config.yaml,sha256=cRH8T-c3TAL0nfefRvt9pFsjbTWNEg38NRyHR7RpJsk,19534
-leap_model_parser-0.1.228.dist-info/METADATA,sha256=4mXS089Qn_kVo07OcvrVsHvQnbu6clRRnJXircAOEG0,1138
-leap_model_parser-0.1.228.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-leap_model_parser-0.1.228.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.228.dist-info/licenses/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.228.dist-info/RECORD,,
+leap_model_parser-0.1.232.dist-info/METADATA,sha256=3jnqLtGeBomuwwUqg-9mV4mVHvl-h3fOTuaoKTN5EOE,1138
+leap_model_parser-0.1.232.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+leap_model_parser-0.1.232.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.232.dist-info/licenses/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.232.dist-info/RECORD,,