Skip to content

Supports subgraph in the light API #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdpython merged 18 commits into from
Nov 13, 2023
Merged

Supports subgraph in the light API #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e0233dc
Supports subgraph in the light API
xadupre Nov 12, 2023
dac2489
fix opset
xadupre Nov 12, 2023
d75473f
doc
xadupre Nov 12, 2023
42ce40b
disable
xadupre Nov 12, 2023
b3dd245
disable check_model on Windows
xadupre Nov 12, 2023
292d3cd
add check_model
xadupre Nov 12, 2023
2db8edb
issue
xadupre Nov 12, 2023
9291536
more consistent with CI
xadupre Nov 13, 2023
9fc696e
add missing import
xadupre Nov 13, 2023
aeab071
fix misspelling
xadupre Nov 13, 2023
8be137a
add missing import
xadupre Nov 13, 2023
8354ae2
disable one test on windows
xadupre Nov 13, 2023
b922647
disable more tests
xadupre Nov 13, 2023
d3da504
more disabling
xadupre Nov 13, 2023
d2262e3
disable more tests on windows
xadupre Nov 13, 2023
ad82c19
rename
xadupre Nov 13, 2023
3910302
disable the right tests
xadupre Nov 13, 2023
2cdaeae
fix type discrepancies on windows
xadupre Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename
  • Loading branch information
@xadupre
xadupre committed Nov 13, 2023
commit ad82c19ec08d43448c063202727df8b0db20f707
8 changes: 4 additions & 4 deletions _unittests/ut_light_api/test_translate_classic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_check_code(self):
outputs.append(make_tensor_value_info("Y", TensorProto.FLOAT, shape=[]))
graph = make_graph(
nodes,
"noname",
"onename",
inputs,
outputs,
initializers,
Expand Down Expand Up @@ -77,7 +77,7 @@ def test_exp(self):
outputs.append(make_tensor_value_info('Y', TensorProto.FLOAT, shape=[]))
graph = make_graph(
nodes,
'noname',
'light_api',
inputs,
outputs,
initializers,
Expand Down Expand Up @@ -161,7 +161,7 @@ def test_transpose(self):
outputs.append(make_tensor_value_info('Y', TensorProto.FLOAT, shape=[]))
graph = make_graph(
nodes,
'noname',
'light_api',
inputs,
outputs,
initializers,
Expand Down Expand Up @@ -223,7 +223,7 @@ def test_topk_reverse(self):
outputs.append(make_tensor_value_info('Indices', TensorProto.FLOAT, shape=[]))
graph = make_graph(
nodes,
'noname',
'light_api',
inputs,
outputs,
initializers,
Expand Down
3 changes: 2 additions & 1 deletion onnx_array_api/light_api/inner_emitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ def _emit_begin_graph(self, **kwargs: Dict[str, Any]) -> List[str]:
return lines

def _emit_end_graph(self, **kwargs: Dict[str, Any]) -> List[str]:
name = kwargs.get("name", "noname")
lines = [
"graph = make_graph(",
" nodes,",
" 'noname',",
f" {name!r},",
" inputs,",
" outputs,",
" initializers,",
Expand Down
7 changes: 6 additions & 1 deletion onnx_array_api/light_api/translate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,16 @@ def export(self, as_str, single_line: bool = False) -> Union[str, List[str]]:
),
)
)
if isinstance(self.proto_, (GraphProto, FunctionProto)):
name = self.proto_.name
else:
name = self.proto_.graph.name
rows.extend(
self.emitter(
EventType.END_FUNCTION
if isinstance(self.proto_, FunctionProto)
else EventType.END_GRAPH
else EventType.END_GRAPH,
name=name,
)
)

Expand Down