Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/Codestyle-Check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- develop
- 'release/*'
- 'release/**'

jobs:
pre-commit:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-bypass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
permissions:
contents: read
env:
CI_TEAM_MEMBERS: '["yuanlehome","YuanRisheng","Jiang-Jia-Jun","DDDivano","XieYunshen","EmmonsCurse","CSWYF3634076","plusNew001"]'
CI_TEAM_MEMBERS: '["yuanlehome","YuanRisheng","Jiang-Jia-Jun","DDDivano","XieYunshen","EmmonsCurse","CSWYF3634076","plusNew001","freeliuzc"]'
outputs:
can-skip: ${{ steps.final-output.outputs.can-skip }}
can-skip-docs: ${{ steps.final-output.outputs.can-skip-docs }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_iluvatar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ILUVATAR-CI
on:
pull_request:
types: [opened, synchronize]
branches: [develop, release/**]
branches: [develop, release/*]
permissions: read-all

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_metax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- synchronize
branches:
- develop
- release/**
- release/*

This comment was marked as outdated.


permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_xpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI_XPU
on:
pull_request:
types: [opened, synchronize]
branches: [develop, release/**]
branches: [develop, release/*]
permissions: read-all

concurrency:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def apply_ep_prefill(
if fastdeploy.envs.FD_MOE_PROB_IN_ADVANCE:
out = paddlefleet_ops.fused_swiglu_scale(out, dst_weights)
else:
out = paddle.incubate.nn.functional.swiglu(out)
out = paddle.nn.functional.swiglu(out)
ffn_out = paddle.incubate.nn.functional.batched_gemm(
out,
getattr(layer, self.added_weight_attrs[1]),
Expand Down Expand Up @@ -335,7 +335,6 @@ def apply_tp(
layer.routed_scaling_factor,
layer.gate_correction_bias,
getattr(layer, "renormalize", True),

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

❓ 疑问 use_fused_cast=use_fused 调用参数被删除

若此参数对应的底层函数签名已移除 use_fused_cast,请确认其他 MoE backends(fused_moe_deepgemm_backend.pyfused_moe_triton_backend.py 等)中调用同一函数的位置是否已同步更新,避免 TypeError 运行时错误。

use_fused_cast=use_fused,
)
else:
gate_out = gate_out.cast("float32")
Expand Down Expand Up @@ -406,7 +405,6 @@ def apply_tp(
layer.gate_correction_bias,
getattr(layer, "renormalize", True),
topk_reduce_func=getattr(layer, "topk_reduce_func", None),
use_fused_cast=use_fused,
)

(
Expand Down
6 changes: 3 additions & 3 deletions tests/input/test_process_stop_token_ids.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Tests for process_stop_token_ids in fastdeploy.input.utils.common."""
"""Tests for process_stop_token_ids in fastdeploy.input.utils."""

from fastdeploy.input.utils.common import process_stop_token_ids
from fastdeploy.input.utils import process_stop_token_ids


def _mock_update_stop_seq_fn(stop_sequences):
Expand Down Expand Up @@ -115,4 +115,4 @@ def test_stop_token_ids_empty_list():
test_empty_request()
test_stop_token_ids_none()
test_stop_token_ids_empty_list()
print("All tests passed.")
print("All tests passed.")
2 changes: 1 addition & 1 deletion tests/layers/test_speculative_sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def _create_default_sampling_metadata(
fake_sampling_metadata = SamplingMetadata(
temperature=paddle.full(shape=[batch_size, 1], fill_value=0.9, dtype="float32"),
top_p=paddle.full(shape=[batch_size, 1], fill_value=0.7, dtype="float32"),
top_k=paddle.full(shape=[batch_size, 1], fill_value=0, dtype="int32"),
top_k=paddle.full(shape=[batch_size, 1], fill_value=0, dtype="int64"),
prompt_lens=paddle.full(shape=[batch_size, 1], fill_value=0, dtype="int64"),
step_idx=paddle.full(shape=[batch_size, 1], fill_value=0, dtype="int64"),
token_ids_all=_create_tokens_tensor(batch_size, max_seq_len),
Expand Down
3 changes: 3 additions & 0 deletions tests/model_executor/test_ep.py
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,9 @@ def fake_get_moe_scores(*_args, **_kwargs):
routed_scaling_factor=1.0,
gate_correction_bias=None,
renormalize=False,
fd_config=SimpleNamespace(
scheduler_config=SimpleNamespace(enable_moe_scores_elementwise_fuse=False),
),
)
gate_out = paddle.randn([1, 4], dtype="float32")

Expand Down