merge

Signed-off-by: Xavier Dupre <[email protected]>
microsoft · Jun 27, 2024 · 12dd1a0 · 12dd1a0
2 parents ab552a5 + be00339
commit 12dd1a0
Show file tree

Hide file tree

Showing 251 changed files with 6,631 additions and 1,376 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -99,12 +99,32 @@ jobs:
         with:
           name: Error reports (${{ matrix.name }}-${{ matrix.os }})
           path: error_reports
-      - name: Upload IR profiling results
-        if: matrix.name == 'py311' || matrix.name == 'py311-onnx-weekly'
-        uses: actions/upload-artifact@v3
+
+  dort:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        transformers: ["4.37.2", "4.41.2"]
+        torch: ["release", "nightly"]
+        python_version: ["3.11"]
+        nox-tag: ["test-dort"]
+        name:
+          - dort
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v5
         with:
-          name: IR profiling results
-          path: tests/ir/serde_test_profiles
+          python-version: ${{ matrix.python_version }}
+      - name: Install nox
+        run: python -m pip install nox
+      - name: Pull Test Data
+        run: git lfs pull
+      - run: |
+          nox -t ${{ matrix.nox-tag }} --forcecolor -- ${{ matrix.torch }} ${{ matrix.transformers }}
+        name: Run tests
 
   build_docs:
     strategy:

diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ coverage.xml
 cover/
 test-output.xml
 dump_*/*
+*.sarif
 
 # Sphinx documentation
 docs/_build/
@@ -94,6 +95,8 @@ dmypy.json
 
 # Generated files
 *.onnx
+*.csv
+*.xlsx
 !testdata/**/*.onnx
 *.onnxlib
 **/onnx_backend_test_code/**

diff --git a/README.md b/README.md
@@ -18,6 +18,8 @@ models using a subset of Python. ONNX Script is:
 Note however that ONNX Script does **not** intend to support the entirety
 of the Python language.
 
+Website: [https://onnxscript.ai/](https://onnxscript.ai/)
+
 ## Design Overview
 
 ONNX Script provides a few major capabilities for authoring and debugging

diff --git a/docs/api/index.md b/docs/api/index.md
@@ -1,8 +1,17 @@
 # API
 
+## Author Models
+
 ```{toctree}
 decorator
 opsets
 converter
 values
 ```
+
+## Tests and Tools
+
+```{toctree}
+testing
+tools
+```
diff --git a/docs/api/testing.md b/docs/api/testing.md
@@ -0,0 +1,6 @@
+# Testing
+
+```{eval-rst}
+.. automodule:: onnxscript.testing
+    :members:
+```
diff --git a/docs/api/tools.md b/docs/api/tools.md
@@ -0,0 +1,19 @@
+# Tools
+
+## Transformers Models
+
+```{eval-rst}
+.. autofunction:: onnxscript.tools.transformers_models.get_model_and_inputs
+```
+
+```{eval-rst}
+.. autofunction:: onnxscript.tools.transformers_models.phi.get_phi_model_from_config
+```
+
+```{eval-rst}
+.. autofunction:: onnxscript.tools.transformers_models.phi3.get_phi3_model_from_config
+```
+
+```{eval-rst}
+.. autofunction:: onnxscript.tools.transformers_models.llama.get_llama_model_from_config
+```
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,9 @@
-# Configuration file for the Sphinx documentation builder.
-# To run the documentation: python -m sphinx docs dist/html
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+"""Configuration file for the Sphinx documentation builder.
+
+To run the documentation: python -m sphinx docs dist/html
+"""
 
 import os
 import re

diff --git a/docs/examples/01_plot_selu.py b/docs/examples/01_plot_selu.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 Generating a FunctionProto
 ==========================

diff --git a/docs/examples/02_plot_square_loss.py b/docs/examples/02_plot_square_loss.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 Generating a ModelProto
 =======================

diff --git a/docs/examples/03_export_lib.py b/docs/examples/03_export_lib.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 Generating a LibProto
 =====================

diff --git a/docs/examples/04_plot_eager_mode_evaluation.py b/docs/examples/04_plot_eager_mode_evaluation.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 Eager mode evaluation
 =====================

diff --git a/docs/examples/05_plot_model_props.py b/docs/examples/05_plot_model_props.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 ModelProto Properties
 =====================

diff --git a/docs/examples/06_plot_model_local_funs.py b/docs/examples/06_plot_model_local_funs.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """
 Model Local Functions
 =====================

diff --git a/docs/intermediate_representation/getting_started.ipynb b/docs/intermediate_representation/getting_started.ipynb
@@ -18,19 +18,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pathlib\n",
-    "\n",
     "import onnx\n",
     "\n",
     "from onnxscript import ir\n",
     "\n",
     "# Load the model as onnx.ModelProto\n",
-    "model_proto = onnx.load(\n",
-    "    pathlib.Path(ir.__file__).parent.parent.parent\n",
-    "    / \"testdata\"\n",
-    "    / \"dort_models\"\n",
-    "    / \"llama_forward.onnx\"\n",
-    ")\n",
+    "model_proto = onnx.load(\"../../testdata/dort_models/llama_forward.onnx\")\n",
     "\n",
     "# Create an IR object from the model\n",
     "model = ir.serde.deserialize_model(model_proto)"
@@ -1479,7 +1472,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/docs/test/test_documentation_examples.py b/docs/test/test_documentation_examples.py
@@ -1,7 +1,5 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-# --------------------------------------------------------------------------
 
 import os
 import subprocess

diff --git a/docs/tutorial/examples/dropout.py b/docs/tutorial/examples/dropout.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/firstdim.py b/docs/tutorial/examples/firstdim.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/forloop.py b/docs/tutorial/examples/forloop.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/forwhileloop.py b/docs/tutorial/examples/forwhileloop.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/hardmax_end_to_end.py b/docs/tutorial/examples/hardmax_end_to_end.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 import onnx
 
 # We use ONNX opset 15 to define the function below.

diff --git a/docs/tutorial/examples/leaky_relu.py b/docs/tutorial/examples/leaky_relu.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/leaky_relu_attr_promoted.py b/docs/tutorial/examples/leaky_relu_attr_promoted.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/omitted_input.py b/docs/tutorial/examples/omitted_input.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/outerscope_redef_error.py b/docs/tutorial/examples/outerscope_redef_error.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import graph, script
 from onnxscript import opset15 as op
 
@@ -13,7 +15,7 @@ def Sum(sum_in, next):
             return sum_out, sum_out
 
         g = op.Constant(value=1)
-        all_sum, cumulative_sum = op.Scan(0, X, body=Sum, num_scan_inputs=1)
+        _all_sum, cumulative_sum = op.Scan(0, X, body=Sum, num_scan_inputs=1)
         return cumulative_sum
 
 except Exception as e:

diff --git a/docs/tutorial/examples/scanloop.py b/docs/tutorial/examples/scanloop.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import graph, script
 from onnxscript import opset15 as op
 
@@ -9,5 +11,5 @@ def Sum(sum_in, next):
         sum_out = sum_in + next
         return sum_out, sum_out
 
-    all_sum, cumulative_sum = op.Scan(0, X, body=Sum, num_scan_inputs=1)
+    _all_sum, cumulative_sum = op.Scan(0, X, body=Sum, num_scan_inputs=1)
     return cumulative_sum
diff --git a/docs/tutorial/examples/softplus.py b/docs/tutorial/examples/softplus.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 # We use ONNX opset 15 to define the function below.
 from onnxscript import opset15 as op
 from onnxscript import script

diff --git a/docs/tutorial/examples/tensor_attr.py b/docs/tutorial/examples/tensor_attr.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnx import TensorProto, helper
 
 from onnxscript import opset15 as op

diff --git a/docs/tutorial/examples/tensor_attr2.py b/docs/tutorial/examples/tensor_attr2.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnx import TensorProto, helper
 
 from onnxscript import opset15 as op

diff --git a/docs/tutorial/examples/tensor_attr_short.py b/docs/tutorial/examples/tensor_attr_short.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnxscript import opset15 as op
 from onnxscript import script
 

diff --git a/docs/tutorial/examples/whileloop.py b/docs/tutorial/examples/whileloop.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 from onnx import TensorProto
 from onnx.helper import make_tensor
 

diff --git a/docs/tutorial/rewriter/examples/broadcast_matmul.py b/docs/tutorial/rewriter/examples/broadcast_matmul.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """Onnx Pattern Rewriting with match condition parameter.
 
 This script shows how to define a rewriting rule based on patterns while

diff --git a/docs/tutorial/rewriter/examples/erfgelu.py b/docs/tutorial/rewriter/examples/erfgelu.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """Onnx Pattern Rewriting.
 
 This script shows how to define a rewriting rule based on patterns.

diff --git a/docs/update_readme.py b/docs/update_readme.py
@@ -1,4 +1,6 @@
-# Script to update end-to-end example in README.md.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+"""Script to update end-to-end example in README.md."""
 
 updated_readme = []
 with open("README.md", encoding="utf-8") as f:
@@ -12,7 +14,7 @@
             with open(
                 "docs/tutorial/examples/hardmax_end_to_end.py", encoding="utf-8"
             ) as example_f:
-                example_code = example_f.readlines()
+                example_code = example_f.readlines()[2:]  # Skip the copyright header
                 updated_readme += example_code
         if line == "```\n" and in_stub:
             updated_readme.append(line)

diff --git a/examples/pattern_rewriting.py b/examples/pattern_rewriting.py
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 """Onnx Pattern Rewriting.
 
 This script shows how to define a rewriting rule based on patterns.
@@ -74,7 +76,9 @@ def rotary_match_pattern(op, x, pos_ids, axis):
 
     matmul = op.MatMul(pos_ids, cast)
     transpose = op.Transpose(matmul)
-    output, length = op.ConcatTraining(transpose, transpose, domain="com.microsoft", outputs=2)
+    output, _length = op.ConcatTraining(
+        transpose, transpose, domain="com.microsoft", outputs=2
+    )
 
     sin = op.Sin(output)
     cast1 = op.Cast(sin, to=onnx.TensorProto.FLOAT)