leap-model-parser 0.1.258__tar.gz → 0.1.259.dev0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/PKG-INFO +2 -2
  2. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/leap_graph_editor.py +0 -16
  3. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/pyproject.toml +2 -2
  4. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/LICENSE +0 -0
  5. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/README.md +0 -0
  6. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/__init__.py +0 -0
  7. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/contract/__init__.py +0 -0
  8. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/contract/graph.py +0 -0
  9. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/contract/importmodelresponse.py +0 -0
  10. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/contract/nodedata.py +0 -0
  11. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/contract/ui_components.json +0 -0
  12. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/keras_json_model_import.py +0 -0
  13. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/model_parser.py +0 -0
  14. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/__init__.py +0 -0
  15. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/layerpedia/__init__.py +0 -0
  16. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/layerpedia/layerpedia.py +0 -0
  17. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/tlinspection/__init__.py +0 -0
  18. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/tlinspection/leapinspection.py +0 -0
  19. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/uicomponents/__init__.py +0 -0
  20. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/uicomponents/generatenodedata.py +0 -0
  21. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/uicomponents/tensorflowinscpection.py +0 -0
  22. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/uicomponents/ui_components.json +0 -0
  23. {leap_model_parser-0.1.258 → leap_model_parser-0.1.259.dev0}/leap_model_parser/utils/uicomponents/ui_components_config.yaml +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: leap-model-parser
3
- Version: 0.1.258
3
+ Version: 0.1.259.dev0
4
4
  Summary:
5
5
  Home-page: https://github.com/tensorleap/leap-model-parser
6
6
  License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: keras-data-format-converter (==0.1.24)
17
17
  Requires-Dist: leap-model-rebuilder (==0.1.7)
18
18
  Requires-Dist: numpy (>=1.22.3,<2.0.0)
19
19
  Requires-Dist: onnx (==1.13.0)
20
- Requires-Dist: onnx2kerastl (==0.0.198)
20
+ Requires-Dist: onnx2kerastl (==0.0.199.dev0)
21
21
  Requires-Dist: tensorflow (==2.12.0) ; platform_machine == "x86_64"
22
22
  Requires-Dist: tensorflow-io-gcs-filesystem (==0.34.0)
23
23
  Requires-Dist: tensorflow-macos (==2.12.0) ; platform_machine == "arm64"
@@ -89,16 +89,6 @@ class LeapGraphEditor:
89
89
  return node
90
90
  return None
91
91
 
92
- @staticmethod
93
- def _expected_output_count(connections: List[NodeConnection]) -> int:
94
- # The integration test refers to model outputs as Prediction0, Prediction1, ...; it expects
95
- # at least as many outputs as its highest index + 1.
96
- indices = [int(input_node.type.value.replace('Prediction', ''))
97
- for connection in connections if connection.node_inputs is not None
98
- for input_node in connection.node_inputs.values()
99
- if 'Prediction' in input_node.type.value]
100
- return max(indices) + 1 if indices else 0
101
-
102
92
  def _replace_prediction_node_name_with_correct_name(self, connections: List[NodeConnection]) -> List[NodeConnection]:
103
93
  index_by_resolved_name: Dict[str, int] = {}
104
94
  for connection in connections:
@@ -107,12 +97,6 @@ class LeapGraphEditor:
107
97
  for input_name, input_node in connection.node_inputs.items():
108
98
  if 'Prediction' in input_node.type.value:
109
99
  prediction_index = int(input_node.type.value.replace('Prediction', ''))
110
- n_outputs = len(self.keras_model.outputs)
111
- if prediction_index >= n_outputs:
112
- expected = self._expected_output_count(connections)
113
- raise Exception(
114
- f"The model has {n_outputs} output{'' if n_outputs == 1 else 's'}, "
115
- f"the integration expects {expected}.")
116
100
  origin_name = self.keras_model.outputs[prediction_index].node.layer.name
117
101
  known_index = index_by_resolved_name.setdefault(origin_name, prediction_index)
118
102
  # The same tensor returned twice binds correctly; two tensors of one layer
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "leap-model-parser"
3
- version = "0.1.258"
3
+ version = "0.1.259.dev0"
4
4
  description = ""
5
5
  authors = ["idan <idan.yogev@tensorleap.ai>"]
6
6
  license = "MIT"
@@ -18,7 +18,7 @@ tensorflow = {version = "2.12.0", markers = "platform_machine == 'x86_64'"}
18
18
  tensorflow-macos = {version = "2.12.0", markers = "platform_machine == 'arm64'"}
19
19
  numpy = "^1.22.3"
20
20
  onnx = "1.13.0"
21
- onnx2kerastl = "0.0.198"
21
+ onnx2kerastl = "0.0.199.dev0"
22
22
  keras-data-format-converter = "0.1.24"
23
23
  leap-model-rebuilder = "0.1.7"
24
24
  tensorflow-io-gcs-filesystem = "0.34.0"