Skip to content

Commit f4595f9

Browse files
JacobSzwejbkaJacobSzwejbka
committed
Reland recurrent gated delta rule custom op
1 parent 4dc1b5b commit f4595f9

12 files changed

Lines changed: 1235 additions & 94 deletions

‎.ci/scripts/unittest-linux-cmake.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ if ! python -c "import tosa_serializer" >/dev/null 2>&1; then
2020
fi
2121

2222
# NOTE: Will be removed when tosa-tools is installed via pypi
23+
if grep -q "^cmake\\.verbose = true$" "${TOSA_SERIALIZATION_DIR}/pyproject.toml"; then
24+
sed -i "s/^cmake\\.verbose = true$/build.verbose = true/" \
25+
"${TOSA_SERIALIZATION_DIR}/pyproject.toml"
26+
fi
27+
if grep -q "^dynamic = \\[\"version\"\\]$" "${TOSA_SERIALIZATION_DIR}/pyproject.toml"; then
28+
sed -i "s/^dynamic = \\[\"version\"\\]$/version = \"0.0.0\"/" \
29+
"${TOSA_SERIALIZATION_DIR}/pyproject.toml"
30+
fi
2331
python -m pip install pybind11==2.10.4
2432
CMAKE_POLICY_VERSION_MINIMUM=3.5 BUILD_PYBIND=1 \
2533
python -m pip install --no-dependencies \

‎examples/models/llama/attention.py‎

Lines changed: 93 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import logging
12
from abc import ABC, abstractmethod
23
from enum import Enum
34
from typing import Any, Dict, Optional, Tuple, Type, TypedDict
@@ -56,6 +57,8 @@ def forward(
5657

5758

5859
ATTENTION_REGISTRY: Dict[str, Type[Attention]] = {}
60+
_RECURRENT_GATED_DELTA_RULE_OP = None
61+
_TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP = False
5962

6063

6164
def register_attention(name: str):
@@ -68,6 +71,38 @@ def decorator(cls: Type[Attention]):
6871
return decorator
6972

7073

74+
def _get_recurrent_gated_delta_rule_op():
75+
global _RECURRENT_GATED_DELTA_RULE_OP
76+
global _TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP
77+
78+
if _TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP:
79+
return _RECURRENT_GATED_DELTA_RULE_OP
80+
81+
_TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP = True
82+
try:
83+
_RECURRENT_GATED_DELTA_RULE_OP = (
84+
torch.ops.llama.recurrent_gated_delta_rule.default
85+
)
86+
return _RECURRENT_GATED_DELTA_RULE_OP
87+
except (AttributeError, RuntimeError):
88+
pass
89+
90+
try:
91+
from executorch.extension.llm.custom_ops import custom_ops # noqa: F401
92+
except (ImportError, OSError, RuntimeError):
93+
logging.debug("Failed to import custom ops library", exc_info=True)
94+
return None
95+
96+
try:
97+
_RECURRENT_GATED_DELTA_RULE_OP = (
98+
torch.ops.llama.recurrent_gated_delta_rule.default
99+
)
100+
except (AttributeError, RuntimeError):
101+
_RECURRENT_GATED_DELTA_RULE_OP = None
102+
103+
return _RECURRENT_GATED_DELTA_RULE_OP
104+
105+
71106
class KVCache(nn.Module):
72107
def __init__(
73108
self,
@@ -762,28 +797,43 @@ def _apply_causal_conv(self, mixed_qkv: torch.Tensor) -> torch.Tensor:
762797
out = F.silu(out[:, :, -seq_len:]).to(mixed_qkv.dtype)
763798
return out.transpose(1, 2).contiguous()
764799

765-
def _recurrent_gated_delta_rule(
800+
def _gated_delta_rule_op(
766801
self,
767802
query: torch.Tensor,
768803
key: torch.Tensor,
769804
value: torch.Tensor,
770805
g: torch.Tensor,
771806
beta: torch.Tensor,
772807
) -> torch.Tensor:
773-
# query/key/value: (batch, seq_len, num_heads, head_dim)
774-
# g/beta: (batch, seq_len, num_heads)
775-
initial_dtype = query.dtype
776-
query = _l2norm(query, dim=-1, eps=1e-6)
777-
key = _l2norm(key, dim=-1, eps=1e-6)
778-
query, key, value, beta, g = [
779-
x.transpose(1, 2).contiguous().to(torch.float32)
780-
for x in (query, key, value, beta, g)
781-
]
808+
batch_size = query.shape[0]
809+
recurrent_gated_delta_rule_op = _get_recurrent_gated_delta_rule_op()
810+
if recurrent_gated_delta_rule_op is not None:
811+
return recurrent_gated_delta_rule_op(
812+
query,
813+
key,
814+
value,
815+
g,
816+
beta,
817+
self.recurrent_state[:batch_size],
818+
)
819+
return self._naive_gated_delta_rule_op(
820+
query,
821+
key,
822+
value,
823+
g,
824+
beta,
825+
)
782826

783-
batch_size, num_heads, sequence_length, k_head_dim = key.shape
827+
def _naive_gated_delta_rule_op(
828+
self,
829+
query: torch.Tensor,
830+
key: torch.Tensor,
831+
value: torch.Tensor,
832+
g: torch.Tensor,
833+
beta: torch.Tensor,
834+
) -> torch.Tensor:
835+
batch_size, num_heads, sequence_length, _ = key.shape
784836
v_head_dim = value.shape[-1]
785-
scale = 1.0 / (query.shape[-1] ** 0.5)
786-
query = query * scale
787837

788838
core_attn_out = torch.zeros(
789839
batch_size,
@@ -817,6 +867,36 @@ def _recurrent_gated_delta_rule(
817867
last_recurrent_state.to(self.recurrent_state.dtype)
818868
)
819869

870+
return core_attn_out
871+
872+
def _recurrent_gated_delta_rule(
873+
self,
874+
query: torch.Tensor,
875+
key: torch.Tensor,
876+
value: torch.Tensor,
877+
g: torch.Tensor,
878+
beta: torch.Tensor,
879+
) -> torch.Tensor:
880+
# query/key/value: (batch, seq_len, num_heads, head_dim)
881+
# g/beta: (batch, seq_len, num_heads)
882+
initial_dtype = query.dtype
883+
query = _l2norm(query, dim=-1, eps=1e-6)
884+
key = _l2norm(key, dim=-1, eps=1e-6)
885+
query, key, value, beta, g = [
886+
x.transpose(1, 2).contiguous().to(torch.float32)
887+
for x in (query, key, value, beta, g)
888+
]
889+
890+
scale = 1.0 / (query.shape[-1] ** 0.5)
891+
query = query * scale
892+
893+
core_attn_out = self._gated_delta_rule_op(
894+
query,
895+
key,
896+
value,
897+
g,
898+
beta,
899+
)
820900
return core_attn_out.transpose(1, 2).contiguous().to(initial_dtype)
821901

822902
def forward(

‎examples/models/llama/tests/test_export_llama_lib.py‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
# This source code is licensed under the BSD-style license found in the
66
# LICENSE file in the root directory of this source tree.
77

8+
import json
9+
import tempfile
810
import unittest
11+
from pathlib import Path
912

1013
from executorch.devtools.backend_debug import get_delegation_info
1114

@@ -25,6 +28,7 @@
2528

2629
from executorch.examples.models.llama.export_llama_lib import (
2730
_export_llama,
31+
_prepare_for_llama_export,
2832
build_args_parser,
2933
get_quantizer_and_quant_params,
3034
)
@@ -41,6 +45,39 @@
4145

4246

4347
class ExportLlamaLibTest(unittest.TestCase):
48+
def _make_tiny_qwen35_params(self) -> dict:
49+
return {
50+
"dim": 64,
51+
"hidden_dim": 128,
52+
"n_heads": 4,
53+
"head_dim": 16,
54+
"n_kv_heads": 2,
55+
"n_layers": 4,
56+
"norm_eps": 1e-6,
57+
"rope_theta": 10000000.0,
58+
"use_scaled_rope": False,
59+
"vocab_size": 256,
60+
"use_hf_rope": True,
61+
"partial_rotary_factor": 0.25,
62+
"attention_qkv_bias": False,
63+
"use_qk_norm": True,
64+
"qk_norm_before_rope": True,
65+
"attention_type": "mha",
66+
"use_q_gate": True,
67+
"rms_norm_add_unit_offset": True,
68+
"linear_conv_kernel_dim": 4,
69+
"linear_key_head_dim": 8,
70+
"linear_value_head_dim": 8,
71+
"linear_num_key_heads": 4,
72+
"linear_num_value_heads": 4,
73+
"layer_types": [
74+
"linear_attention",
75+
"full_attention",
76+
"linear_attention",
77+
"full_attention",
78+
],
79+
}
80+
4481
def test_has_expected_ops_and_op_counts(self):
4582
"""
4683
Checks the presence of unwanted expensive ops.
@@ -70,6 +107,41 @@ def test_has_expected_ops_and_op_counts(self):
70107
for op, _op_info in delegation_info.delegation_by_operator.items():
71108
self.assertTrue(op not in UNWANTED_OPS)
72109

110+
def test_tiny_qwen35_export_uses_recurrent_gated_delta_rule(self):
111+
with tempfile.TemporaryDirectory() as temp_dir:
112+
params_path = Path(temp_dir) / "tiny_qwen35.json"
113+
params_path.write_text(json.dumps(self._make_tiny_qwen35_params()))
114+
115+
parser = build_args_parser()
116+
args = parser.parse_args(
117+
[
118+
"--model",
119+
"qwen3_5_0_8b",
120+
"--params",
121+
str(params_path),
122+
"--use_kv_cache",
123+
"--disable_dynamic_shape",
124+
"--max_seq_length",
125+
"8",
126+
"--max_context_length",
127+
"8",
128+
]
129+
)
130+
131+
llm_config = LlmConfig.from_args(args)
132+
builder = _prepare_for_llama_export(llm_config).export()
133+
assert builder.pre_autograd_graph_module is not None
134+
135+
recurrent_nodes = [
136+
node
137+
for node in builder.pre_autograd_graph_module.graph.nodes
138+
if "auto_functionalized_v2" in str(node.target)
139+
and node.args
140+
and "llama.recurrent_gated_delta_rule" in str(node.args[0])
141+
]
142+
143+
self.assertEqual(len(recurrent_nodes), 2)
144+
73145
@unittest.skipUnless(HAS_ARM_BACKEND, "ARM backend not available")
74146
def test_get_quantizer_and_quant_params_returns_tosa_quantizer(self):
75147
llm_config = LlmConfig()

‎examples/models/llama/tests/test_qwen3_5_attention.py‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
import unittest
88

9+
import executorch.examples.models.llama.attention as attention_module
910
import torch
11+
1012
from executorch.examples.models.llama.attention import ATTENTION_REGISTRY
1113
from executorch.examples.models.llama.model_args import ModelArgs
1214
from executorch.examples.models.llama.norm import RMSNorm
@@ -123,6 +125,109 @@ def test_gated_deltanet_no_input_pos_does_not_leak_state(self):
123125
torch.allclose(state_after_first, state_after_second, atol=1e-5)
124126
)
125127

128+
def test_gated_deltanet_chunked_prefill_matches_full_sequence(self):
129+
torch.manual_seed(0)
130+
args = self._make_args(
131+
use_kv_cache=True,
132+
use_q_gate=True,
133+
linear_conv_kernel_dim=4,
134+
linear_key_head_dim=4,
135+
linear_value_head_dim=4,
136+
linear_num_key_heads=2,
137+
linear_num_value_heads=4,
138+
)
139+
rope = Rope(args)
140+
attn_full = ATTENTION_REGISTRY["gated_deltanet"](args, 0, rope)
141+
attn_chunked = ATTENTION_REGISTRY["gated_deltanet"](args, 0, rope)
142+
attn_chunked.load_state_dict(attn_full.state_dict())
143+
144+
x = torch.randn(1, 5, args.dim)
145+
dummy_freq = torch.zeros(1, 1)
146+
147+
full_output, _ = attn_full(
148+
x,
149+
dummy_freq,
150+
dummy_freq,
151+
input_pos=torch.tensor([0], dtype=torch.long),
152+
)
153+
154+
chunk_outputs = []
155+
for start, end in ((0, 3), (3, 4), (4, 5)):
156+
output, _ = attn_chunked(
157+
x[:, start:end],
158+
dummy_freq,
159+
dummy_freq,
160+
input_pos=torch.tensor([start], dtype=torch.long),
161+
)
162+
chunk_outputs.append(output)
163+
164+
chunked_output = torch.cat(chunk_outputs, dim=1)
165+
166+
self.assertTrue(torch.allclose(chunked_output, full_output, atol=1e-5))
167+
self.assertTrue(
168+
torch.allclose(
169+
attn_chunked.recurrent_state, attn_full.recurrent_state, atol=1e-5
170+
)
171+
)
172+
self.assertTrue(
173+
torch.allclose(attn_chunked.conv_state, attn_full.conv_state, atol=1e-5)
174+
)
175+
176+
def test_gated_deltanet_custom_op_matches_fallback(self):
177+
recurrent_op = attention_module._get_recurrent_gated_delta_rule_op()
178+
if recurrent_op is None:
179+
self.skipTest("llama::recurrent_gated_delta_rule is not available")
180+
181+
torch.manual_seed(0)
182+
args = self._make_args(
183+
use_kv_cache=True,
184+
use_q_gate=True,
185+
linear_conv_kernel_dim=4,
186+
linear_key_head_dim=4,
187+
linear_value_head_dim=4,
188+
linear_num_key_heads=2,
189+
linear_num_value_heads=4,
190+
)
191+
rope = Rope(args)
192+
attn_custom = ATTENTION_REGISTRY["gated_deltanet"](args, 0, rope)
193+
attn_fallback = ATTENTION_REGISTRY["gated_deltanet"](args, 0, rope)
194+
attn_fallback.load_state_dict(attn_custom.state_dict())
195+
196+
query = torch.randn(1, 3, attn_custom.num_v_heads, attn_custom.head_k_dim)
197+
key = torch.randn(1, 3, attn_custom.num_v_heads, attn_custom.head_k_dim)
198+
value = torch.randn(1, 3, attn_custom.num_v_heads, attn_custom.head_v_dim)
199+
g = torch.randn(1, 3, attn_custom.num_v_heads)
200+
beta = torch.sigmoid(torch.randn(1, 3, attn_custom.num_v_heads))
201+
202+
original_op = attention_module._RECURRENT_GATED_DELTA_RULE_OP
203+
original_tried_loading = (
204+
attention_module._TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP
205+
)
206+
try:
207+
attention_module._RECURRENT_GATED_DELTA_RULE_OP = recurrent_op
208+
attention_module._TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP = True
209+
custom_output = attn_custom._recurrent_gated_delta_rule(
210+
query, key, value, g, beta
211+
)
212+
213+
attention_module._RECURRENT_GATED_DELTA_RULE_OP = None
214+
attention_module._TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP = True
215+
fallback_output = attn_fallback._recurrent_gated_delta_rule(
216+
query, key, value, g, beta
217+
)
218+
finally:
219+
attention_module._RECURRENT_GATED_DELTA_RULE_OP = original_op
220+
attention_module._TRIED_LOADING_RECURRENT_GATED_DELTA_RULE_OP = (
221+
original_tried_loading
222+
)
223+
224+
self.assertTrue(torch.allclose(custom_output, fallback_output, atol=1e-5))
225+
self.assertTrue(
226+
torch.allclose(
227+
attn_custom.recurrent_state, attn_fallback.recurrent_state, atol=1e-5
228+
)
229+
)
230+
126231

127232
if __name__ == "__main__":
128233
unittest.main()

‎extension/aten_util/make_aten_functor_from_et_functor.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
#pragma once
1616
#include <type_traits>
1717
#include <vector>
18-
#if __cplusplus < 201703L
18+
#if (defined(_MSC_VER) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)) || \
19+
(!defined(_MSC_VER) && __cplusplus < 201703L)
1920
#error "This header requires C++17"
2021
#endif
2122
#include <ATen/native/Resize.h>

0 commit comments

Comments
 (0)