Skip to content

[Optimization] merge matmul and add #6986

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

Open
BingooYang wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

[Optimization] merge matmul and add #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5ae0bc
merge matmul and add
BingooYang Mar 24, 2026
0100aaa
modify format
BingooYang Mar 24, 2026
47cbb7b
using paddle.nn.functional.linear
BingooYang Mar 24, 2026
a89ec24
using _C_ops.linear
BingooYang Mar 26, 2026
c594ab1
using paddle.nn.functional.linear
BingooYang Mar 27, 2026
d7bca72
add FLAGS_use_legacy_linear env var in test case
BingooYang Mar 29, 2026
70c2524
fix format
BingooYang Mar 29, 2026
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
6 changes: 2 additions & 4 deletions fastdeploy/model_executor/layers/linear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ def process_loaded_weights(self, layer, weights) -> None:
layer.weight.set_value(weights)

def apply(self, layer: nn.Layer, x: paddle.Tensor) -> paddle.Tensor:
linear_out = paddle.matmul(x, layer.weight)
if layer.with_bias:
linear_out = paddle.add(linear_out, layer.bias)
return linear_out
out = paddle.nn.functional.linear(x, layer.weight, layer.bias if layer.with_bias else None)
return out


class LinearBase(nn.Layer):
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/4cards_cases/test_GLM_45_AIR_mtp_tp4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
is_port_open,
)

os.environ["FLAGS_use_legacy_linear"] = "1"
Copy link
Copy Markdown
Collaborator

@qingqing01 qingqing01 Mar 31, 2026

Choose a reason for hiding this comment

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

建议单测不增加环境变量



@pytest.fixture(scope="session", autouse=True)
def setup_and_run_server():
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/4cards_cases/test_GLM_45_AIR_tp4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
is_port_open,
)

os.environ["FLAGS_use_legacy_linear"] = "1"


@pytest.fixture(scope="session", autouse=True)
def setup_and_run_server():
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/test_EB_Lite_serving.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
is_port_open,
)

os.environ["FLAGS_use_legacy_linear"] = "1"


@pytest.fixture(scope="session", autouse=True)
def setup_and_run_server():
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/test_Qwen3VLMoe_serving.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
is_port_open,
)

os.environ["FLAGS_use_legacy_linear"] = "1"


@pytest.fixture(scope="session", autouse=True)
def setup_and_run_server():
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/test_ernie_03b_pd_router_v1_rdma_global_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
is_port_open,
)

os.environ["FLAGS_use_legacy_linear"] = "1"
# Read ports from environment variables; use default values if not set
FD_CONNECTOR_PORT = int(os.getenv("FD_CONNECTOR_PORT", 8433))
FD_ROUTER_PORT = int(os.getenv("FD_ROUTER_PORT", 8533))
Expand Down
Loading