Skip to content

Commit bb8674c

Browse files
committed
[None][fix] Drop alignas(64) on MiniMax-M3 CUtensorMap members
CUtensorMap already carries its own alignment, which is stricter than 64 bytes in newer CUDA toolkits; clang-hosted nvcc rejects the weaker alignas with "alignment cannot be set to less than the default alignment" (SBSA build). Signed-off-by: peihengh <259410613+peihu-nv@users.noreply.github.com>
1 parent 24cccaf commit bb8674c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎cpp/tensorrt_llm/kernels/minimaxM3/attnC1.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ struct MinimaxM3AttnC1Params
9595
long long pf_a0, pf_b0, pf_a1, pf_b1; // mega: L2 prefetch regions issued in the attention window (bytes 0: none)
9696
int pf_hint; // 1: evict_last policy on the prefetch
9797
uint8_t const* wpre; // mega: optional pre-tiled QKV weight [N/128][K/128][16 KB swizzled smem image], or null
98-
alignas(64) CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
99-
alignas(64) CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
98+
CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
99+
CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
100100
};
101101

102102
//! Launch the c1 kernel on `stream`. The caller fills `params` except `wmap_o`, the o_proj weight's TMA

‎cpp/tensorrt_llm/kernels/minimaxM3/attnMega.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ struct MinimaxM3AttnMegaParams
9696
unsigned int* flags; // mega: [0, 20) tile counters (4 per call), [32 + CTA] the attention CTAs' targets
9797
long long pf_a0, pf_b0, pf_a1, pf_b1; // mega: L2 prefetch regions issued in the attention window (bytes 0: none)
9898
int pf_hint; // 1: evict_last policy on the prefetch
99-
alignas(64) CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
100-
alignas(64) CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
99+
CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
100+
CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
101101
};
102102

103103
//! Launch the megakernel on `stream`. The caller fills `params` except `wmap`, `wmap_o`, `packed`,

‎cpp/tensorrt_llm/kernels/minimaxM3/fusedDecodeAttn.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ struct MinimaxM3FusedDecodeAttnParams
8686
long long pf_a0, pf_b0, pf_a1, pf_b1; // mega: L2 prefetch regions issued in the attention window (bytes 0: none)
8787
int pf_hint; // 1: evict_last policy on the prefetch
8888
uint8_t const* wpre; // mega: optional pre-tiled QKV weight [N/128][K/128][16 KB swizzled smem image], or null
89-
alignas(64) CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
90-
alignas(64) CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
89+
CUtensorMap wmap; // the [2560, 6144] E4M3 weight, 128 x 128 boxes, 128-byte swizzle
90+
CUtensorMap wmap_o; // mega: the [6144, 2048] E4M3 o_proj weight, same boxes
9191
};
9292

9393
//! Whether the (decode_query_len, query tokens per cluster, KV blocks per CTA) geometry is compiled. The MXFP8

0 commit comments

Comments
 (0)