Skip to content

Commit b857eae

Browse files
pamelap-nvidiapamelap-nvidia
authored
Merge branch 'release/1.0' into fix_sm120_moe_trtllm
2 parents 0565af1 + a343e85 commit b857eae

File tree

1,270 files changed

+1564
-1413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,270 files changed

+1564
-1413
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ examples/**/.git
99
examples/**/*.bin
1010
examples/**/*.engine
1111
examples/**/*.onnx
12+
examples/**/*.safetensors
1213
examples/**/c-model
1314
examples/models/core/gpt/gpt*

‎cpp/tensorrt_llm/batch_manager/assignReqSeqSlots.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ void tensorrt_llm::batch_manager::AssignReqSeqSlots::operator()(SequenceSlotMana
3030
{
3131
for (auto const& llmReq : requests)
3232
{
33+
if (llmReq->isDisaggGenerationInitState())
34+
{
35+
// Skip assigning sequence slot for DISAGG_GENERATION_INIT request
36+
continue;
37+
}
3338
auto const isReqNew = (llmReq->isContextInitState() && !llmReq->mSeqSlot)
3439
|| (llmReq->isDisaggGenerationTransmissionComplete());
3540
if (isReqNew && llmReq->getReturnPerfMetrics())

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvCausalP32VarSeqQ128Kv128PersistentContext_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e06195ad4d3acd230b8bc1d66b689f1a58dd48370c3b7cf6f055f9ef34fb47c9
2+
oid sha256:0463694700e2c5f62965c541107c79c006d3b9df4b25ea8000c98a9e13aaf3ec
33
size 1577653

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvCausalP32VarSeqQ128Kv128StaticContext_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:788a02f89f4cd29ea535d4d6b8c5c0395a86ab84554b229620123b1030a3d99c
2+
oid sha256:d85fa7329248eb7ea6ed4f870d992256df8aa11cba17d66505e5fa63e1101652
33
size 1477991

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvCausalP64VarSeqQ128Kv128PersistentContext_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:07822a0005c071db6f7d504d8c1b159913cc5aefc7b617ba280efa5e1b2e28cf
2+
oid sha256:e54545d3d306167689f6e01d56d40847e6954aac13212623f98a46c9fef30518
33
size 1568033

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvCausalP64VarSeqQ128Kv128StaticContext_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f04d446486d7d0c20a06a954d5844b3693f03ce3dd89de4c49b8e0b36edb6e7f
2+
oid sha256:1d495cc51c472f376b537624bb572680b381c310dc16d344838cb1b814f41553
33
size 1465263

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvDenseP32MultiCtasKvCgaVarSeqQ16Kv128StaticSwapsAbForGen_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:db0e02eb9c68788c4ebea760b2010e79b5d13e06733ac1ed3f04c43738904b8f
2+
oid sha256:353015002c158ed0ceecf60bfc892efc9397171f19c03510312616167fc8e2ac
33
size 1118485

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvDenseP32MultiCtasKvCgaVarSeqQ8Kv128StaticSwapsAbForGen_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b8972ae5deaef930cab70df016f0555dbbdece0309c7e58a67b69c9b957b7006
2+
oid sha256:51d94728cd7f1ae0919bc9780bfb0175e52834b7cc1a27185f653a2ef296b9ef
33
size 1055583

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvDenseP32MultiCtasKvVarSeqQ16Kv128StaticSwapsAbForGen_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dc0b0c64136781dc1e5c9bf35a0340b9316a1d6a660d73567630523ea6fe2d55
2+
oid sha256:ab219d1f02790604fc82a9f2fbc40b6906a2d1a4403add0cdf0122e9cd2bf6c3
33
size 1119417

‎cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/cubin/FmhaSm100Kernel_QE4m3KvE2m1OE4m3H128PagedKvDenseP32MultiCtasKvVarSeqQ8Kv128StaticSwapsAbForGen_cubin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9bc2b2256618c802dbe58d08ec929361a12bdd43e6e43c6565d081e7c0f8c125
2+
oid sha256:1395fa2302795d44299d0b7fb35d167dc09d82476f69bdd21b2a817c94374cba
33
size 1063717

0 commit comments

Comments
 (0)