Skip to content

[Refactor] Small refactor for group topk #30562

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

Merged
yewentao256 merged 5 commits into from
Dec 16, 2025
Merged

[Refactor] Small refactor for group topk #30562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea124e3
small refactor
yewentao256 Dec 12, 2025
968934e
Merge branch 'main' into wentao-small-refactor
robertgshaw2-redhat Dec 13, 2025
db006e8
Merge branch 'main' into wentao-small-refactor
yewentao256 Dec 14, 2025
c9b968a
Merge branch 'main' into wentao-small-refactor
yewentao256 Dec 15, 2025
1890d00
Merge branch 'main' into wentao-small-refactor
yewentao256 Dec 16, 2025
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
13 changes: 10 additions & 3 deletions csrc/moe/grouped_topk_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,13 @@ __device__ inline T apply_sigmoid(T val) {

template <ScoringFunc SF, typename T>
__device__ inline T apply_scoring(T val) {
if constexpr (SF == SCORING_SIGMOID) {
if constexpr (SF == SCORING_NONE) {
return val;
} else if constexpr (SF == SCORING_SIGMOID) {
return apply_sigmoid(val);
} else {
static_assert(SF == SCORING_NONE || SF == SCORING_SIGMOID,
"Unsupported ScoringFunc in apply_scoring");
return val;
}
}
Expand Down Expand Up @@ -670,10 +674,13 @@ __global__ void group_idx_and_topk_idx_kernel(

if (case_id < num_tokens) {
if (if_proceed_next_topk) {
float scale = routed_scaling_factor;
if (renormalize) {
scale /= topk_sum;
}
for (int i = lane_id; i < topk; i += WARP_SIZE) {
float base = cuda_cast<float, T>(s_topk_value[i]);
float value = renormalize ? (base / topk_sum * routed_scaling_factor)
: (base * routed_scaling_factor);
float value = base * scale;
topk_indices[i] = s_topk_idx[i];
topk_values[i] = value;
}
Expand Down
1 change: 0 additions & 1 deletion tests/v1/determinism/test_batch_invariance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ def test_logprobs_bitwise_batch_invariance_bs1_vs_bsN(
llm = LLM(
model=model_name,
tensor_parallel_size=tp_size,
# enable_prefix_caching=False,
max_num_seqs=32,
max_model_len=8192,
dtype="bfloat16", # not everything is supported
Expand Down