[WIP] Use IR in onnxscript #1409

justinchuby · 2024-04-19T19:19:11Z

onnxscript/irbuilder.py

-            self.callee.name,
-            [_opt_var_to_str(x) for x in self.args],
-            [str(x) for x in self.result],
+    def to_node(self, node_name: str, values: Mapping[str, ir.Value]) -> ir.Node:


onnxscript/irbuilder.py

@@ -8,18 +8,18 @@
 import io
 import logging
 import warnings
-from typing import Any, Optional, Protocol, Sequence, Union
+from typing import Any, Mapping, Optional, Protocol, Sequence, Union


codecov · 2024-04-19T19:24:20Z

Codecov Report

Attention: Patch coverage is 46.80851% with 25 lines in your changes are missing coverage. Please review.

Project coverage is 51.25%. Comparing base (c979aae) to head (060009e).

Files	Patch %	Lines
onnxscript/irbuilder.py	42.85%	24 Missing ⚠️
onnxscript/values.py	66.66%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #1409       +/-   ##
===========================================
- Coverage   77.04%   51.25%   -25.80%     
===========================================
  Files         209      200        -9     
  Lines       22488    20898     -1590     
  Branches     3813     3607      -206     
===========================================
- Hits        17326    10711     -6615     
- Misses       4451     9648     +5197     
+ Partials      711      539      -172

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

onnxscript/irbuilder.py

-            self.name,
-            inputs=[x.name for x in self.inputs],
-            outputs=[y.name for y in self.outputs],
+        values = {}


onnxscript/irbuilder.py

-            self.name,
-            inputs=[x.name for x in self.inputs],
-            outputs=[y.name for y in self.outputs],
+        values = {}


onnxscript/irbuilder.py

+            nodes.append(node)
+            if node.domain not in opsets:
+                # FIXME(justinchuby): Node version
+                assert s.version is not None


onnxscript/irbuilder.py

+            if node.domain not in opsets:
+                # FIXME(justinchuby): Node version
+                assert s.version is not None
+                opsets[node.domain] = s.version


onnxscript/irbuilder.py

+                if output.name in function_outputs:
+                    function_outputs[output.name] = output
+        inputs = [ir.Input(input.name) for input in self.inputs]
+        for name, output in function_outputs.items():


onnxscript/irbuilder.py

-        return IRAttributeValue(proto)
+    def make_attr_ref(self, attrname: str, refname: str, pytype: type) -> ir.RefAttr:
+        return ir.RefAttr(
+            attrname, refname, ta.pytype_to_attrtype(pytype)


justinchuby · 2024-04-19T19:47:29Z

Should stmt subclass node or own a node?

github-actions · 2024-04-19T19:55:39Z

Test Results

30 files + 2 30 suites +2 15m 37s ⏱️ - 3h 27m 15s
415 tests - 5 433 334 ✅ - 3 630 13 💤 - 1 864 50 ❌ + 43 18 🔥 + 18
11 451 runs - 497 576 8 016 ✅ - 72 582 312 💤 - 428 086 1 200 ❌ +1 169 1 923 🔥 +1 923

For more details on these failures and errors, see this check.

Results for commit 060009e. ± Comparison against base commit c979aae.

This pull request removes 5451 and adds 18 tests. Note that renamed tests count towards both.

docs.test.test_documentation_examples.TestDocumentationExample ‑ test_documentation_examples
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_attr_ref
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_double_attr_val_promotion
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0000_test_convinteger_without_padding
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0001_test_sqrt
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0002_test_min_int32
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0003_test_col2im
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0004_test_reduce_sum_square_do_not_keepdims_example_expanded
onnxscript.backend.onnx_export_test.TestOnnxBackEnd ‑ test_export2python_produces_correct_onnx_script_model_0005_test_mod_mixed_sign_int8
…

onnxscript.backend.onnx_export_test
onnxscript.function_libs.tools.torch_lib.deduce_type_constraints_test
onnxscript.function_libs.torch_lib.graph_building.__init__
onnxscript.function_libs.torch_lib.graph_building._graph_building_ir
onnxscript.function_libs.torch_lib.graph_building._graph_building_torch
onnxscript.function_libs.torch_lib.graph_building.graph_building_test
onnxscript.function_libs.torch_lib.ops.__init__
onnxscript.function_libs.torch_lib.ops.common
onnxscript.function_libs.torch_lib.ops.core
onnxscript.function_libs.torch_lib.ops.fft
…

♻️ This comment has been updated with latest results.

onnxscript/irbuilder.py

        default_value: int | float | str | None,
    ) -> None:
-        fn.add_attr_parameter(IRAttributeParameter(varname, attribute_type, default_value))
+        fn.add_attr_parameter(ir_convenience.convert_attribute(varname, default_value, attribute_type))


[WIP] Use IR in onnxscript

73b375b

github-advanced-security bot found potential problems Apr 19, 2024

View reviewed changes

working on attr

5714445

justinchuby linked an issue Apr 19, 2024 that may be closed by this pull request

Use IR in ONNX Script converter #1410

Open

github-advanced-security bot found potential problems Apr 19, 2024

View reviewed changes

justinchuby mentioned this pull request Apr 19, 2024

IR Integration plan #1384

Open

gramalingam mentioned this pull request Apr 19, 2024

Refactor pattern matcher #1411

Merged

justinchuby added 2 commits April 23, 2024 00:17

Merge branch 'main' into justinchu/ir-builder-ir

54ce3b4

import

5d753ed

github-advanced-security bot found potential problems Apr 23, 2024

View reviewed changes

Merge branch 'main' into justinchu/ir-builder-ir

060009e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Use IR in onnxscript #1409

[WIP] Use IR in onnxscript #1409

justinchuby commented Apr 19, 2024 •

edited

codecov bot commented Apr 19, 2024 •

edited

justinchuby commented Apr 19, 2024

github-actions bot commented Apr 19, 2024 •

edited

[WIP] Use IR in onnxscript #1409

Are you sure you want to change the base?

[WIP] Use IR in onnxscript #1409

Conversation

justinchuby commented Apr 19, 2024 • edited

codecov bot commented Apr 19, 2024 • edited

Codecov Report

justinchuby commented Apr 19, 2024

github-actions bot commented Apr 19, 2024 • edited

Test Results

justinchuby commented Apr 19, 2024 •

edited

codecov bot commented Apr 19, 2024 •

edited

github-actions bot commented Apr 19, 2024 •

edited