Skip to content
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.

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

Add rotary embedding fusion rule (part 1) #1981

Merged
merged 23 commits into from
Jan 7, 2025
Merged

Add rotary embedding fusion rule (part 1) #1981

merged 23 commits into from
Jan 7, 2025

Conversation

gramalingam
Copy link
Collaborator

@gramalingam gramalingam commented Dec 18, 2024

Initial version of fusion for rotary embedding.

Limitations: currently addresses only non-interleaved and full rotation.

Other:

  • Add support for rewriting rules where the matched nodes are not removed. Useful in cases where matched nodes include some shared nodes.
  • Add optimization to eliminate redundant Reshape (helps simplify pattern).

Copy link

codecov bot commented Dec 18, 2024

❌ 27 Tests Failed:

Tests completed Failed Passed Skipped
13300 27 13273 2445
View the top 3 failed tests by shortest run time
onnxscript.backend.onnx_export_test.TestOnnxBackEnd::test_export2python_produces_correct_onnx_script_model_0462_test_hannwindow_symmetric
Stack Traces | 0.003s run time
onnxscript\backend\onnx_export_test.py:137: in extract_functions
    mod = importlib.import_module(import_name)
C:\hostedtoolcache\windows\Python\3.11.9\x64\Lib\importlib\__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
E   ModuleNotFoundError: No module named 'tests.onnx_backend_test_code.test_hannwindow_symmetric'

The above exception was the direct cause of the following exception:
.nox\test_torch_nightly\Lib\site-packages\parameterized\parameterized.py:620: in standalone_func
    return func(*(a + p.args), **p.kwargs, **kw)
onnxscript\backend\onnx_export_test.py:271: in test_export2python_produces_correct_onnx_script_model
    functions = extract_functions(backend_test.name, code, self.test_folder)
onnxscript\backend\onnx_export_test.py:139: in extract_functions
    raise AssertionError(
E   AssertionError: Unable to import 'tests.onnx_backend_test_code.test_hannwindow_symmetric' (e=No module named 'tests.onnx_backend_test_code.test_hannwindow_symmetric') (file: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_hannwindow_symmetric.py', absolute path: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_hannwindow_symmetric.py', current folder: D:\a\onnxscript\onnxscript
E   ---- CONTENT --
E   import numpy
E   from onnx import TensorProto
E   from onnx.helper import make_tensor
E   from onnxscript import script, external_tensor
E   from onnxscript.values import Opset
E   from onnxscript.onnx_types import FLOAT, INT32
E   from onnxscript.onnx_opset import opset17
E   
E   @script()
E   def bck_test_hannwindow_symmetric(x: INT32) -> (FLOAT[10]):
E       y = opset17.HannWindow(x, periodic=0)
E       return y
onnxscript.backend.onnx_export_test.TestOnnxBackEnd::test_export2python_produces_correct_onnx_script_model_0771_test_pow_types_float32_int32
Stack Traces | 0.003s run time
onnxscript\backend\onnx_export_test.py:137: in extract_functions
    mod = importlib.import_module(import_name)
C:\hostedtoolcache\windows\Python\3.11.9\x64\Lib\importlib\__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
E   ModuleNotFoundError: No module named 'tests.onnx_backend_test_code.test_pow_types_float32_int32'

The above exception was the direct cause of the following exception:
.nox\test_torch_nightly\Lib\site-packages\parameterized\parameterized.py:620: in standalone_func
    return func(*(a + p.args), **p.kwargs, **kw)
onnxscript\backend\onnx_export_test.py:271: in test_export2python_produces_correct_onnx_script_model
    functions = extract_functions(backend_test.name, code, self.test_folder)
onnxscript\backend\onnx_export_test.py:139: in extract_functions
    raise AssertionError(
E   AssertionError: Unable to import 'tests.onnx_backend_test_code.test_pow_types_float32_int32' (e=No module named 'tests.onnx_backend_test_code.test_pow_types_float32_int32') (file: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_pow_types_float32_int32.py', absolute path: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_pow_types_float32_int32.py', current folder: D:\a\onnxscript\onnxscript
E   ---- CONTENT --
E   import numpy
E   from onnx import TensorProto
E   from onnx.helper import make_tensor
E   from onnxscript import script, external_tensor
E   from onnxscript.values import Opset
E   from onnxscript.onnx_types import FLOAT, INT32
E   from onnxscript.onnx_opset import opset15
E   
E   @script()
E   def bck_test_pow_types_float32_int32(x: FLOAT[3], y: INT32[3]) -> (FLOAT[3]):
E       z = opset15.Pow(x, y)
E       return z
onnxscript.backend.onnx_export_test.TestOnnxBackEnd::test_export2python_produces_correct_onnx_script_model_0907_test_reduce_prod_keepdims_random
Stack Traces | 0.003s run time
onnxscript\backend\onnx_export_test.py:137: in extract_functions
    mod = importlib.import_module(import_name)
C:\hostedtoolcache\windows\Python\3.11.9\x64\Lib\importlib\__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
E   ModuleNotFoundError: No module named 'tests.onnx_backend_test_code.test_reduce_prod_keepdims_random'

The above exception was the direct cause of the following exception:
.nox\test_torch_nightly\Lib\site-packages\parameterized\parameterized.py:620: in standalone_func
    return func(*(a + p.args), **p.kwargs, **kw)
onnxscript\backend\onnx_export_test.py:271: in test_export2python_produces_correct_onnx_script_model
    functions = extract_functions(backend_test.name, code, self.test_folder)
onnxscript\backend\onnx_export_test.py:139: in extract_functions
    raise AssertionError(
E   AssertionError: Unable to import 'tests.onnx_backend_test_code.test_reduce_prod_keepdims_random' (e=No module named 'tests.onnx_backend_test_code.test_reduce_prod_keepdims_random') (file: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_reduce_prod_keepdims_random.py', absolute path: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_reduce_prod_keepdims_random.py', current folder: D:\a\onnxscript\onnxscript
E   ---- CONTENT --
E   import numpy
E   from onnx import TensorProto
E   from onnx.helper import make_tensor
E   from onnxscript import script, external_tensor
E   from onnxscript.values import Opset
E   from onnxscript.onnx_types import FLOAT, INT64
E   from onnxscript.onnx_opset import opset18
E   
E   @script()
E   def bck_test_reduce_prod_keepdims_random(data: FLOAT[3,2,2], axes: INT64[1]) -> (FLOAT[3,1,2]):
E       reduced = opset18.ReduceProd(data, axes, keepdims=1)
E       return reduced

To view more test analytics, go to the Test Analytics Dashboard
📢 Thoughts on this report? Let us know!

onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
@gramalingam gramalingam changed the title Add rotary embedding fusion rule (part 1) [Draft - WIP] Add rotary embedding fusion rule (part 1) Dec 20, 2024
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
onnxscript/rewriter/_ir_utils.py Fixed Show fixed Hide fixed
@gramalingam gramalingam changed the title [Draft - WIP] Add rotary embedding fusion rule (part 1) Add rotary embedding fusion rule (part 1) Dec 23, 2024
@gramalingam gramalingam enabled auto-merge (squash) January 2, 2025 20:57
Copy link
Collaborator

@justinchuby justinchuby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some nits, thanks!

@gramalingam gramalingam merged commit 343161a into main Jan 7, 2025
24 of 27 checks passed
@gramalingam gramalingam deleted the rama/fuse-attn branch January 7, 2025 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants