sglang 0.5.3rc0__py3-none-any.whl → 0.5.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- sglang/bench_one_batch.py +54 -37
- sglang/bench_one_batch_server.py +340 -34
- sglang/bench_serving.py +340 -159
- sglang/check_env.py +1 -1
- sglang/compile_deep_gemm.py +6 -2
- sglang/global_config.py +1 -25
- sglang/lang/api.py +6 -0
- sglang/lang/backend/runtime_endpoint.py +1 -1
- sglang/lang/interpreter.py +1 -0
- sglang/lang/ir.py +13 -0
- sglang/launch_server.py +9 -2
- sglang/profiler.py +20 -3
- sglang/srt/_custom_ops.py +1 -1
- sglang/srt/batch_invariant_ops/__init__.py +27 -0
- sglang/srt/batch_invariant_ops/batch_invariant_ops.py +547 -0
- sglang/srt/checkpoint_engine/checkpoint_engine_worker.py +142 -0
- sglang/srt/compilation/backend.py +437 -0
- sglang/srt/compilation/compilation_config.py +20 -0
- sglang/srt/compilation/compilation_counter.py +47 -0
- sglang/srt/compilation/compile.py +210 -0
- sglang/srt/compilation/compiler_interface.py +503 -0
- sglang/srt/compilation/cuda_piecewise_backend.py +228 -0
- sglang/srt/compilation/fix_functionalization.py +134 -0
- sglang/srt/compilation/fx_utils.py +83 -0
- sglang/srt/compilation/inductor_pass.py +140 -0
- sglang/srt/compilation/pass_manager.py +66 -0
- sglang/srt/compilation/piecewise_context_manager.py +40 -0
- sglang/srt/compilation/weak_ref_tensor_jit.py +16 -0
- sglang/srt/configs/__init__.py +8 -0
- sglang/srt/configs/deepseek_ocr.py +262 -0
- sglang/srt/configs/deepseekvl2.py +194 -96
- sglang/srt/configs/dots_ocr.py +64 -0
- sglang/srt/configs/dots_vlm.py +2 -7
- sglang/srt/configs/falcon_h1.py +309 -0
- sglang/srt/configs/load_config.py +33 -2
- sglang/srt/configs/mamba_utils.py +117 -0
- sglang/srt/configs/model_config.py +284 -118
- sglang/srt/configs/modelopt_config.py +30 -0
- sglang/srt/configs/nemotron_h.py +286 -0
- sglang/srt/configs/olmo3.py +105 -0
- sglang/srt/configs/points_v15_chat.py +29 -0
- sglang/srt/configs/qwen3_next.py +11 -47
- sglang/srt/configs/qwen3_omni.py +613 -0
- sglang/srt/configs/qwen3_vl.py +576 -0
- sglang/srt/connector/remote_instance.py +1 -1
- sglang/srt/constrained/base_grammar_backend.py +6 -1
- sglang/srt/constrained/llguidance_backend.py +5 -0
- sglang/srt/constrained/outlines_backend.py +1 -1
- sglang/srt/constrained/outlines_jump_forward.py +1 -1
- sglang/srt/constrained/reasoner_grammar_backend.py +9 -6
- sglang/srt/constrained/utils.py +12 -0
- sglang/srt/constrained/xgrammar_backend.py +26 -15
- sglang/srt/debug_utils/dumper.py +10 -3
- sglang/srt/disaggregation/ascend/conn.py +2 -2
- sglang/srt/disaggregation/ascend/transfer_engine.py +48 -10
- sglang/srt/disaggregation/base/conn.py +17 -4
- sglang/srt/disaggregation/common/conn.py +268 -98
- sglang/srt/disaggregation/decode.py +172 -39
- sglang/srt/disaggregation/decode_kvcache_offload_manager.py +185 -0
- sglang/srt/disaggregation/decode_schedule_batch_mixin.py +25 -16
- sglang/srt/disaggregation/fake/conn.py +11 -3
- sglang/srt/disaggregation/mooncake/conn.py +203 -555
- sglang/srt/disaggregation/nixl/conn.py +217 -63
- sglang/srt/disaggregation/prefill.py +113 -270
- sglang/srt/disaggregation/utils.py +36 -5
- sglang/srt/distributed/device_communicators/all_reduce_utils.py +16 -0
- sglang/srt/distributed/device_communicators/custom_all_reduce.py +6 -6
- sglang/srt/distributed/device_communicators/pymscclpp.py +2 -2
- sglang/srt/distributed/device_communicators/pynccl.py +24 -12
- sglang/srt/distributed/device_communicators/pynccl_allocator.py +2 -2
- sglang/srt/distributed/device_communicators/shm_broadcast.py +4 -2
- sglang/srt/distributed/device_communicators/symm_mem.py +164 -0
- sglang/srt/distributed/naive_distributed.py +5 -4
- sglang/srt/distributed/parallel_state.py +203 -97
- sglang/srt/elastic_ep/elastic_ep.py +74 -0
- sglang/srt/entrypoints/context.py +3 -2
- sglang/srt/entrypoints/engine.py +85 -65
- sglang/srt/entrypoints/grpc_server.py +632 -305
- sglang/srt/entrypoints/harmony_utils.py +2 -2
- sglang/srt/entrypoints/http_server.py +169 -17
- sglang/srt/entrypoints/http_server_engine.py +1 -7
- sglang/srt/entrypoints/openai/protocol.py +327 -34
- sglang/srt/entrypoints/openai/serving_base.py +74 -8
- sglang/srt/entrypoints/openai/serving_chat.py +202 -118
- sglang/srt/entrypoints/openai/serving_classify.py +204 -0
- sglang/srt/entrypoints/openai/serving_completions.py +20 -4
- sglang/srt/entrypoints/openai/serving_embedding.py +1 -0
- sglang/srt/entrypoints/openai/serving_responses.py +47 -2
- sglang/srt/entrypoints/openai/serving_tokenize.py +144 -0
- sglang/srt/environ.py +323 -0
- sglang/srt/eplb/eplb_algorithms/__init__.py +18 -1
- sglang/srt/eplb/eplb_algorithms/deepseek.py +0 -2
- sglang/srt/eplb/eplb_algorithms/elasticity_aware.py +87 -0
- sglang/srt/eplb/expert_distribution.py +3 -4
- sglang/srt/eplb/expert_location.py +30 -5
- sglang/srt/eplb/expert_location_dispatch.py +2 -2
- sglang/srt/eplb/expert_location_updater.py +2 -2
- sglang/srt/function_call/base_format_detector.py +17 -18
- sglang/srt/function_call/function_call_parser.py +21 -16
- sglang/srt/function_call/glm4_moe_detector.py +4 -8
- sglang/srt/function_call/gpt_oss_detector.py +24 -1
- sglang/srt/function_call/json_array_parser.py +61 -0
- sglang/srt/function_call/kimik2_detector.py +17 -4
- sglang/srt/function_call/utils.py +98 -7
- sglang/srt/grpc/compile_proto.py +245 -0
- sglang/srt/grpc/grpc_request_manager.py +915 -0
- sglang/srt/grpc/health_servicer.py +189 -0
- sglang/srt/grpc/scheduler_launcher.py +181 -0
- sglang/srt/grpc/sglang_scheduler_pb2.py +81 -68
- sglang/srt/grpc/sglang_scheduler_pb2.pyi +124 -61
- sglang/srt/grpc/sglang_scheduler_pb2_grpc.py +92 -1
- sglang/srt/layers/activation.py +11 -7
- sglang/srt/layers/attention/aiter_backend.py +17 -18
- sglang/srt/layers/attention/ascend_backend.py +125 -10
- sglang/srt/layers/attention/attention_registry.py +226 -0
- sglang/srt/layers/attention/base_attn_backend.py +32 -4
- sglang/srt/layers/attention/cutlass_mla_backend.py +3 -3
- sglang/srt/layers/attention/double_sparsity_backend.py +2 -2
- sglang/srt/layers/attention/dual_chunk_flashattention_backend.py +1 -1
- sglang/srt/layers/attention/fla/chunk.py +0 -1
- sglang/srt/layers/attention/fla/chunk_o.py +1 -1
- sglang/srt/layers/attention/fla/chunk_scaled_dot_kkt.py +2 -2
- sglang/srt/layers/attention/fla/fused_recurrent.py +4 -4
- sglang/srt/layers/attention/fla/fused_sigmoid_gating_recurrent.py +2 -2
- sglang/srt/layers/attention/fla/index.py +0 -2
- sglang/srt/layers/attention/fla/layernorm_gated.py +50 -32
- sglang/srt/layers/attention/fla/utils.py +0 -3
- sglang/srt/layers/attention/fla/wy_fast.py +0 -2
- sglang/srt/layers/attention/flashattention_backend.py +52 -15
- sglang/srt/layers/attention/flashinfer_backend.py +357 -212
- sglang/srt/layers/attention/flashinfer_mla_backend.py +31 -33
- sglang/srt/layers/attention/flashmla_backend.py +9 -7
- sglang/srt/layers/attention/hybrid_attn_backend.py +12 -4
- sglang/srt/layers/attention/hybrid_linear_attn_backend.py +236 -133
- sglang/srt/layers/attention/intel_amx_backend.py +1 -1
- sglang/srt/layers/attention/mamba/causal_conv1d.py +2 -1
- sglang/srt/layers/attention/mamba/causal_conv1d_triton.py +24 -103
- sglang/srt/layers/attention/mamba/mamba.py +514 -1
- sglang/srt/layers/attention/mamba/mamba2_metadata.py +211 -0
- sglang/srt/layers/attention/mamba/mixer2_rms_norm_gated.py +120 -0
- sglang/srt/layers/attention/mamba/ops/__init__.py +2 -0
- sglang/srt/layers/attention/mamba/ops/layernorm_gated.py +172 -0
- sglang/srt/layers/attention/mamba/ops/mamba_ssm.py +442 -0
- sglang/srt/layers/attention/mamba/ops/ssd_bmm.py +214 -0
- sglang/srt/layers/attention/mamba/ops/ssd_chunk_scan.py +562 -0
- sglang/srt/layers/attention/mamba/ops/ssd_chunk_state.py +646 -0
- sglang/srt/layers/attention/mamba/ops/ssd_combined.py +261 -0
- sglang/srt/layers/attention/mamba/ops/ssd_state_passing.py +264 -0
- sglang/srt/layers/attention/npu_ops/mla_preprocess.py +393 -0
- sglang/srt/layers/attention/nsa/dequant_k_cache.py +163 -0
- sglang/srt/layers/attention/nsa/index_buf_accessor.py +354 -0
- sglang/srt/layers/attention/nsa/nsa_indexer.py +718 -0
- sglang/srt/layers/attention/nsa/quant_k_cache.py +255 -0
- sglang/srt/layers/attention/nsa/tilelang_kernel.py +785 -0
- sglang/srt/layers/attention/nsa/transform_index.py +144 -0
- sglang/srt/layers/attention/nsa/triton_kernel.py +136 -0
- sglang/srt/layers/attention/nsa/utils.py +23 -0
- sglang/srt/layers/attention/nsa_backend.py +1201 -0
- sglang/srt/layers/attention/tbo_backend.py +6 -6
- sglang/srt/layers/attention/torch_flex_backend.py +325 -0
- sglang/srt/layers/attention/triton_backend.py +249 -42
- sglang/srt/layers/attention/triton_ops/double_sparsity_attention.py +2 -2
- sglang/srt/layers/attention/triton_ops/extend_attention.py +539 -44
- sglang/srt/layers/attention/trtllm_mha_backend.py +7 -9
- sglang/srt/layers/attention/trtllm_mla_backend.py +523 -48
- sglang/srt/layers/attention/utils.py +11 -7
- sglang/srt/layers/attention/vision.py +61 -3
- sglang/srt/layers/attention/wave_backend.py +4 -4
- sglang/srt/layers/attention/xpu_backend.py +1028 -0
- sglang/srt/layers/communicator.py +19 -7
- sglang/srt/layers/{quantization/deep_gemm_wrapper → deep_gemm_wrapper}/compile_utils.py +4 -8
- sglang/srt/layers/deep_gemm_wrapper/configurer.py +25 -0
- sglang/srt/layers/{quantization/deep_gemm_wrapper → deep_gemm_wrapper}/entrypoint.py +3 -3
- sglang/srt/layers/dp_attention.py +28 -1
- sglang/srt/layers/elementwise.py +3 -1
- sglang/srt/layers/layernorm.py +47 -15
- sglang/srt/layers/linear.py +30 -5
- sglang/srt/layers/logits_processor.py +161 -18
- sglang/srt/layers/modelopt_utils.py +11 -0
- sglang/srt/layers/moe/cutlass_moe.py +0 -2
- sglang/srt/layers/moe/cutlass_w4a8_moe.py +213 -21
- sglang/srt/layers/moe/ep_moe/kernels.py +36 -458
- sglang/srt/layers/moe/ep_moe/layer.py +243 -448
- sglang/srt/layers/moe/flashinfer_cutedsl_moe.py +52 -25
- sglang/srt/layers/moe/fused_moe_triton/configs/triton_3_4_0/E=128,N=192,device_name=NVIDIA_H200,dtype=fp8_w8a8.json +146 -0
- sglang/srt/layers/moe/fused_moe_triton/configs/triton_3_4_0/E=256,N=256,device_name=NVIDIA_B200.json +146 -0
- sglang/srt/layers/moe/fused_moe_triton/configs/triton_3_4_0/E=256,N=256,device_name=NVIDIA_H800,dtype=fp8_w8a8,block_shape=[128, 128].json +146 -0
- sglang/srt/layers/moe/fused_moe_triton/configs/triton_3_4_0/E=512,N=128,device_name=NVIDIA_H800,dtype=fp8_w8a8,block_shape=[128, 128].json +146 -0
- sglang/srt/layers/moe/fused_moe_triton/configs/triton_3_4_0/E=512,N=256,device_name=NVIDIA_B200.json +146 -0
- sglang/srt/layers/moe/fused_moe_triton/fused_moe_triton_config.py +17 -5
- sglang/srt/layers/moe/fused_moe_triton/layer.py +86 -81
- sglang/srt/layers/moe/fused_moe_triton/triton_kernels_moe.py +18 -42
- sglang/srt/layers/moe/moe_runner/deep_gemm.py +304 -0
- sglang/srt/layers/moe/moe_runner/runner.py +3 -0
- sglang/srt/layers/moe/moe_runner/triton.py +3 -1
- sglang/srt/layers/moe/rocm_moe_utils.py +0 -1
- sglang/srt/layers/moe/router.py +51 -15
- sglang/srt/layers/moe/token_dispatcher/__init__.py +10 -0
- sglang/srt/layers/moe/token_dispatcher/base.py +1 -1
- sglang/srt/layers/moe/token_dispatcher/deepep.py +177 -106
- sglang/srt/layers/moe/token_dispatcher/mooncake.py +386 -0
- sglang/srt/layers/moe/token_dispatcher/standard.py +46 -0
- sglang/srt/layers/moe/topk.py +3 -2
- sglang/srt/layers/moe/utils.py +27 -1
- sglang/srt/layers/parameter.py +23 -6
- sglang/srt/layers/quantization/__init__.py +2 -53
- sglang/srt/layers/quantization/awq.py +183 -6
- sglang/srt/layers/quantization/awq_triton.py +29 -0
- sglang/srt/layers/quantization/base_config.py +20 -1
- sglang/srt/layers/quantization/compressed_tensors/__init__.py +7 -0
- sglang/srt/layers/quantization/compressed_tensors/compressed_tensors.py +21 -49
- sglang/srt/layers/quantization/compressed_tensors/compressed_tensors_moe.py +421 -70
- sglang/srt/layers/quantization/compressed_tensors/schemes/__init__.py +5 -0
- sglang/srt/layers/quantization/compressed_tensors/schemes/compressed_tensors_w8a16_fp8.py +4 -22
- sglang/srt/layers/quantization/compressed_tensors/schemes/compressed_tensors_w8a8_int8.py +173 -0
- sglang/srt/layers/quantization/compressed_tensors/schemes/compressed_tensors_wNa16.py +339 -0
- sglang/srt/layers/quantization/fp8.py +86 -20
- sglang/srt/layers/quantization/fp8_kernel.py +55 -10
- sglang/srt/layers/quantization/fp8_utils.py +43 -15
- sglang/srt/layers/quantization/fpgemm_fp8.py +2 -3
- sglang/srt/layers/quantization/gptq.py +0 -1
- sglang/srt/layers/quantization/int8_kernel.py +18 -2
- sglang/srt/layers/quantization/marlin_utils.py +12 -0
- sglang/srt/layers/quantization/modelopt_quant.py +141 -81
- sglang/srt/layers/quantization/mxfp4.py +17 -34
- sglang/srt/layers/quantization/petit.py +1 -1
- sglang/srt/layers/quantization/quark/quark.py +3 -1
- sglang/srt/layers/quantization/quark/quark_moe.py +18 -5
- sglang/srt/layers/quantization/quark/schemes/quark_w4a4_mxfp4.py +0 -7
- sglang/srt/layers/quantization/unquant.py +1 -4
- sglang/srt/layers/quantization/utils.py +0 -1
- sglang/srt/layers/quantization/w4afp8.py +51 -24
- sglang/srt/layers/quantization/w8a8_int8.py +45 -27
- sglang/srt/layers/radix_attention.py +59 -9
- sglang/srt/layers/rotary_embedding.py +750 -46
- sglang/srt/layers/sampler.py +84 -16
- sglang/srt/layers/sparse_pooler.py +98 -0
- sglang/srt/layers/utils.py +23 -1
- sglang/srt/layers/vocab_parallel_embedding.py +4 -1
- sglang/srt/lora/backend/base_backend.py +3 -3
- sglang/srt/lora/backend/chunked_backend.py +348 -0
- sglang/srt/lora/backend/triton_backend.py +9 -4
- sglang/srt/lora/eviction_policy.py +139 -0
- sglang/srt/lora/lora.py +7 -5
- sglang/srt/lora/lora_manager.py +33 -7
- sglang/srt/lora/lora_registry.py +1 -1
- sglang/srt/lora/mem_pool.py +41 -17
- sglang/srt/lora/triton_ops/__init__.py +4 -0
- sglang/srt/lora/triton_ops/chunked_sgmv_expand.py +214 -0
- sglang/srt/lora/triton_ops/chunked_sgmv_shrink.py +176 -0
- sglang/srt/lora/utils.py +7 -5
- sglang/srt/managers/cache_controller.py +83 -152
- sglang/srt/managers/data_parallel_controller.py +156 -87
- sglang/srt/managers/detokenizer_manager.py +51 -24
- sglang/srt/managers/io_struct.py +223 -129
- sglang/srt/managers/mm_utils.py +49 -10
- sglang/srt/managers/multi_tokenizer_mixin.py +83 -98
- sglang/srt/managers/multimodal_processor.py +1 -2
- sglang/srt/managers/overlap_utils.py +130 -0
- sglang/srt/managers/schedule_batch.py +340 -529
- sglang/srt/managers/schedule_policy.py +158 -18
- sglang/srt/managers/scheduler.py +665 -620
- sglang/srt/managers/scheduler_input_blocker.py +1 -1
- sglang/srt/managers/scheduler_metrics_mixin.py +150 -131
- sglang/srt/managers/scheduler_output_processor_mixin.py +337 -122
- sglang/srt/managers/scheduler_pp_mixin.py +341 -0
- sglang/srt/managers/scheduler_profiler_mixin.py +62 -15
- sglang/srt/managers/scheduler_runtime_checker_mixin.py +217 -0
- sglang/srt/managers/scheduler_update_weights_mixin.py +40 -14
- sglang/srt/managers/tokenizer_communicator_mixin.py +141 -19
- sglang/srt/managers/tokenizer_manager.py +462 -226
- sglang/srt/managers/tp_worker.py +217 -156
- sglang/srt/managers/utils.py +79 -47
- sglang/srt/mem_cache/allocator.py +21 -22
- sglang/srt/mem_cache/allocator_ascend.py +42 -28
- sglang/srt/mem_cache/base_prefix_cache.py +3 -3
- sglang/srt/mem_cache/chunk_cache.py +20 -2
- sglang/srt/mem_cache/common.py +480 -0
- sglang/srt/mem_cache/evict_policy.py +38 -0
- sglang/srt/mem_cache/hicache_storage.py +44 -2
- sglang/srt/mem_cache/hiradix_cache.py +134 -34
- sglang/srt/mem_cache/mamba_radix_cache.py +993 -0
- sglang/srt/mem_cache/memory_pool.py +602 -208
- sglang/srt/mem_cache/memory_pool_host.py +134 -183
- sglang/srt/mem_cache/multimodal_cache.py +0 -1
- sglang/srt/mem_cache/radix_cache.py +263 -78
- sglang/srt/mem_cache/radix_cache_cpp.py +29 -21
- sglang/srt/mem_cache/storage/__init__.py +10 -0
- sglang/srt/mem_cache/storage/aibrix_kvcache/aibrix_kvcache_storage.py +157 -0
- sglang/srt/mem_cache/storage/aibrix_kvcache/unit_test.py +97 -0
- sglang/srt/mem_cache/storage/backend_factory.py +223 -0
- sglang/srt/mem_cache/storage/eic/eic_storage.py +777 -0
- sglang/srt/mem_cache/storage/eic/test_unit.py +115 -0
- sglang/srt/mem_cache/storage/hf3fs/hf3fs_client.py +0 -1
- sglang/srt/mem_cache/storage/hf3fs/storage_hf3fs.py +180 -59
- sglang/srt/mem_cache/storage/lmcache/lmc_radix_cache.py +15 -9
- sglang/srt/mem_cache/storage/mooncake_store/mooncake_store.py +217 -26
- sglang/srt/mem_cache/storage/nixl/hicache_nixl.py +38 -9
- sglang/srt/mem_cache/storage/nixl/nixl_utils.py +1 -1
- sglang/srt/mem_cache/storage/nixl/test_hicache_nixl_storage.py +17 -2
- sglang/srt/mem_cache/swa_radix_cache.py +115 -58
- sglang/srt/metrics/collector.py +113 -120
- sglang/srt/metrics/func_timer.py +3 -8
- sglang/srt/metrics/utils.py +8 -1
- sglang/srt/model_executor/cpu_graph_runner.py +2 -2
- sglang/srt/model_executor/cuda_graph_runner.py +81 -36
- sglang/srt/model_executor/forward_batch_info.py +40 -50
- sglang/srt/model_executor/model_runner.py +507 -319
- sglang/srt/model_executor/npu_graph_runner.py +11 -5
- sglang/srt/model_executor/piecewise_cuda_graph_runner.py +539 -0
- sglang/srt/model_loader/__init__.py +1 -1
- sglang/srt/model_loader/loader.py +438 -37
- sglang/srt/model_loader/utils.py +0 -1
- sglang/srt/model_loader/weight_utils.py +200 -27
- sglang/srt/models/apertus.py +2 -3
- sglang/srt/models/arcee.py +2 -2
- sglang/srt/models/bailing_moe.py +40 -56
- sglang/srt/models/bailing_moe_nextn.py +3 -4
- sglang/srt/models/bert.py +1 -1
- sglang/srt/models/deepseek_nextn.py +25 -4
- sglang/srt/models/deepseek_ocr.py +1516 -0
- sglang/srt/models/deepseek_v2.py +793 -235
- sglang/srt/models/dots_ocr.py +171 -0
- sglang/srt/models/dots_vlm.py +0 -1
- sglang/srt/models/dots_vlm_vit.py +1 -1
- sglang/srt/models/falcon_h1.py +570 -0
- sglang/srt/models/gemma3_causal.py +0 -2
- sglang/srt/models/gemma3_mm.py +17 -1
- sglang/srt/models/gemma3n_mm.py +2 -3
- sglang/srt/models/glm4_moe.py +17 -40
- sglang/srt/models/glm4_moe_nextn.py +4 -4
- sglang/srt/models/glm4v.py +3 -2
- sglang/srt/models/glm4v_moe.py +6 -6
- sglang/srt/models/gpt_oss.py +12 -35
- sglang/srt/models/grok.py +10 -23
- sglang/srt/models/hunyuan.py +2 -7
- sglang/srt/models/interns1.py +0 -1
- sglang/srt/models/kimi_vl.py +1 -7
- sglang/srt/models/kimi_vl_moonvit.py +4 -2
- sglang/srt/models/llama.py +6 -2
- sglang/srt/models/llama_eagle3.py +1 -1
- sglang/srt/models/longcat_flash.py +6 -23
- sglang/srt/models/longcat_flash_nextn.py +4 -15
- sglang/srt/models/mimo.py +2 -13
- sglang/srt/models/mimo_mtp.py +1 -2
- sglang/srt/models/minicpmo.py +7 -5
- sglang/srt/models/mixtral.py +1 -4
- sglang/srt/models/mllama.py +1 -1
- sglang/srt/models/mllama4.py +27 -6
- sglang/srt/models/nemotron_h.py +511 -0
- sglang/srt/models/olmo2.py +31 -4
- sglang/srt/models/opt.py +5 -5
- sglang/srt/models/phi.py +1 -1
- sglang/srt/models/phi4mm.py +1 -1
- sglang/srt/models/phimoe.py +0 -1
- sglang/srt/models/pixtral.py +0 -3
- sglang/srt/models/points_v15_chat.py +186 -0
- sglang/srt/models/qwen.py +0 -1
- sglang/srt/models/qwen2.py +0 -7
- sglang/srt/models/qwen2_5_vl.py +5 -5
- sglang/srt/models/qwen2_audio.py +2 -15
- sglang/srt/models/qwen2_moe.py +70 -4
- sglang/srt/models/qwen2_vl.py +6 -3
- sglang/srt/models/qwen3.py +18 -3
- sglang/srt/models/qwen3_moe.py +50 -38
- sglang/srt/models/qwen3_next.py +43 -21
- sglang/srt/models/qwen3_next_mtp.py +3 -4
- sglang/srt/models/qwen3_omni_moe.py +661 -0
- sglang/srt/models/qwen3_vl.py +791 -0
- sglang/srt/models/qwen3_vl_moe.py +343 -0
- sglang/srt/models/registry.py +15 -3
- sglang/srt/models/roberta.py +55 -3
- sglang/srt/models/sarashina2_vision.py +268 -0
- sglang/srt/models/solar.py +505 -0
- sglang/srt/models/starcoder2.py +357 -0
- sglang/srt/models/step3_vl.py +3 -5
- sglang/srt/models/torch_native_llama.py +9 -2
- sglang/srt/models/utils.py +61 -0
- sglang/srt/multimodal/processors/base_processor.py +21 -9
- sglang/srt/multimodal/processors/deepseek_ocr.py +37 -0
- sglang/srt/multimodal/processors/deepseek_vl_v2.py +0 -3
- sglang/srt/multimodal/processors/dots_vlm.py +2 -4
- sglang/srt/multimodal/processors/glm4v.py +1 -5
- sglang/srt/multimodal/processors/internvl.py +20 -10
- sglang/srt/multimodal/processors/janus_pro.py +0 -1
- sglang/srt/multimodal/processors/mllama4.py +0 -8
- sglang/srt/multimodal/processors/phi4mm.py +0 -1
- sglang/srt/multimodal/processors/points_v15_chat.py +52 -0
- sglang/srt/multimodal/processors/qwen_vl.py +83 -17
- sglang/srt/multimodal/processors/sarashina2_vision.py +81 -0
- sglang/srt/multimodal/processors/step3_vl.py +1 -1
- sglang/srt/parser/conversation.py +41 -0
- sglang/srt/parser/jinja_template_utils.py +6 -0
- sglang/srt/parser/reasoning_parser.py +0 -1
- sglang/srt/sampling/custom_logit_processor.py +77 -2
- sglang/srt/sampling/sampling_batch_info.py +36 -23
- sglang/srt/sampling/sampling_params.py +75 -0
- sglang/srt/server_args.py +1300 -338
- sglang/srt/server_args_config_parser.py +146 -0
- sglang/srt/single_batch_overlap.py +161 -0
- sglang/srt/speculative/base_spec_worker.py +34 -0
- sglang/srt/speculative/cpp_ngram/ngram.cpp +374 -0
- sglang/srt/speculative/cpp_ngram/ngram.h +110 -0
- sglang/srt/speculative/cpp_ngram/ngram_cache.py +138 -0
- sglang/srt/speculative/cpp_ngram/ngram_cache_binding.cpp +43 -0
- sglang/srt/speculative/cpp_ngram/param.h +125 -0
- sglang/srt/speculative/cpp_ngram/queue.h +71 -0
- sglang/srt/speculative/draft_utils.py +226 -0
- sglang/srt/speculative/eagle_draft_cuda_graph_runner.py +26 -8
- sglang/srt/speculative/eagle_draft_extend_cuda_graph_runner.py +26 -3
- sglang/srt/speculative/eagle_info.py +786 -0
- sglang/srt/speculative/eagle_info_v2.py +458 -0
- sglang/srt/speculative/eagle_utils.py +113 -1270
- sglang/srt/speculative/eagle_worker.py +120 -285
- sglang/srt/speculative/eagle_worker_v2.py +702 -0
- sglang/srt/speculative/ngram_info.py +433 -0
- sglang/srt/speculative/ngram_worker.py +246 -0
- sglang/srt/speculative/spec_info.py +49 -0
- sglang/srt/speculative/spec_utils.py +641 -0
- sglang/srt/speculative/standalone_worker.py +4 -14
- sglang/srt/tokenizer/tiktoken_tokenizer.py +2 -2
- sglang/srt/tracing/trace.py +32 -6
- sglang/srt/two_batch_overlap.py +35 -18
- sglang/srt/utils/__init__.py +2 -0
- sglang/srt/{bench_utils.py → utils/bench_utils.py} +4 -2
- sglang/srt/{utils.py → utils/common.py} +583 -113
- sglang/srt/{hf_transformers_utils.py → utils/hf_transformers_utils.py} +86 -19
- sglang/srt/{host_shared_memory.py → utils/host_shared_memory.py} +0 -1
- sglang/srt/{offloader.py → utils/offloader.py} +4 -4
- sglang/srt/{patch_torch.py → utils/patch_torch.py} +8 -0
- sglang/srt/utils/profile_merger.py +199 -0
- sglang/srt/utils/rpd_utils.py +452 -0
- sglang/srt/utils/slow_rank_detector.py +71 -0
- sglang/srt/{torch_memory_saver_adapter.py → utils/torch_memory_saver_adapter.py} +5 -7
- sglang/srt/warmup.py +8 -4
- sglang/srt/weight_sync/utils.py +1 -1
- sglang/test/attention/test_flashattn_backend.py +1 -1
- sglang/test/attention/test_flashattn_mla_backend.py +0 -1
- sglang/test/attention/test_prefix_chunk_info.py +0 -2
- sglang/test/attention/test_trtllm_mla_backend.py +221 -53
- sglang/test/few_shot_gsm8k_engine.py +2 -4
- sglang/test/get_logits_ut.py +57 -0
- sglang/test/kit_matched_stop.py +157 -0
- sglang/test/longbench_v2/__init__.py +1 -0
- sglang/test/longbench_v2/test_longbench_v2_eval.py +238 -0
- sglang/test/longbench_v2/validate_longbench_v2.py +337 -0
- sglang/test/longbench_v2/validate_longbench_v2_standalone.py +306 -0
- sglang/test/run_eval.py +120 -11
- sglang/test/runners.py +3 -1
- sglang/test/send_one.py +42 -7
- sglang/test/simple_eval_common.py +8 -2
- sglang/test/simple_eval_gpqa.py +0 -1
- sglang/test/simple_eval_humaneval.py +0 -3
- sglang/test/simple_eval_longbench_v2.py +344 -0
- sglang/test/simple_eval_mmmu_vlm.py +441 -0
- sglang/test/test_block_fp8.py +3 -4
- sglang/test/test_block_fp8_deep_gemm_blackwell.py +0 -1
- sglang/test/test_cutlass_moe.py +1 -2
- sglang/test/test_cutlass_w4a8_moe.py +10 -20
- sglang/test/test_deterministic.py +430 -0
- sglang/test/test_deterministic_utils.py +73 -0
- sglang/test/test_disaggregation_utils.py +93 -1
- sglang/test/test_marlin_moe.py +0 -1
- sglang/test/test_programs.py +1 -1
- sglang/test/test_utils.py +432 -16
- sglang/utils.py +10 -1
- sglang/version.py +1 -1
- {sglang-0.5.3rc0.dist-info → sglang-0.5.4.dist-info}/METADATA +64 -43
- {sglang-0.5.3rc0.dist-info → sglang-0.5.4.dist-info}/RECORD +476 -346
- sglang/srt/entrypoints/grpc_request_manager.py +0 -580
- sglang/srt/layers/quantization/deep_gemm_wrapper/configurer.py +0 -32
- sglang/srt/managers/tp_worker_overlap_thread.py +0 -319
- sglang/srt/mem_cache/lora_radix_cache.py +0 -421
- sglang/srt/speculative/build_eagle_tree.py +0 -427
- sglang/test/test_block_fp8_ep.py +0 -358
- /sglang/srt/layers/{quantization/deep_gemm_wrapper → deep_gemm_wrapper}/__init__.py +0 -0
- /sglang/srt/{remote_instance_weight_loader_utils.py → model_loader/remote_instance_weight_loader_utils.py} +0 -0
- /sglang/srt/{aio_rwlock.py → utils/aio_rwlock.py} +0 -0
- /sglang/srt/{poll_based_barrier.py → utils/poll_based_barrier.py} +0 -0
- {sglang-0.5.3rc0.dist-info → sglang-0.5.4.dist-info}/WHEEL +0 -0
- {sglang-0.5.3rc0.dist-info → sglang-0.5.4.dist-info}/licenses/LICENSE +0 -0
- {sglang-0.5.3rc0.dist-info → sglang-0.5.4.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
#include "ngram.h"
|
|
2
|
+
|
|
3
|
+
#include <algorithm>
|
|
4
|
+
#include <cstring>
|
|
5
|
+
#include <limits>
|
|
6
|
+
#include <queue>
|
|
7
|
+
#include <vector>
|
|
8
|
+
|
|
9
|
+
namespace ngram {
|
|
10
|
+
|
|
11
|
+
struct Node {
|
|
12
|
+
std::unordered_map<int32_t, int32_t> next;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
Ngram::Result fillResult(int last_token, int draft_token_num, std::vector<Node>& tree, int root) {
|
|
16
|
+
Ngram::Result info;
|
|
17
|
+
std::vector<int32_t> prevs;
|
|
18
|
+
info.token.reserve(draft_token_num);
|
|
19
|
+
prevs.reserve(draft_token_num);
|
|
20
|
+
std::queue<std::tuple<int32_t, int32_t, int32_t>> queue;
|
|
21
|
+
info.token.emplace_back(last_token);
|
|
22
|
+
prevs.emplace_back(-1);
|
|
23
|
+
|
|
24
|
+
for (auto [token, next] : tree[root].next) {
|
|
25
|
+
queue.emplace(token, next, 0);
|
|
26
|
+
}
|
|
27
|
+
while (queue.size()) {
|
|
28
|
+
auto [token, next, prev] = queue.front();
|
|
29
|
+
queue.pop();
|
|
30
|
+
info.token.emplace_back(token);
|
|
31
|
+
prevs.emplace_back(prev);
|
|
32
|
+
for (auto [t, n] : tree[next].next) {
|
|
33
|
+
queue.emplace(t, n, info.token.size() - 1);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// zero padding to length
|
|
38
|
+
while (info.token.size() < draft_token_num) {
|
|
39
|
+
info.token.emplace_back(0);
|
|
40
|
+
prevs.emplace_back(0);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
int n = info.token.size();
|
|
44
|
+
info.mask.resize(n * n, 0);
|
|
45
|
+
info.mask[0] = 1;
|
|
46
|
+
for (int i = 0; i < n; ++i) {
|
|
47
|
+
if (prevs[i] != -1) {
|
|
48
|
+
memcpy(&info.mask[i * n], &info.mask[prevs[i] * n], prevs[i] + 1);
|
|
49
|
+
}
|
|
50
|
+
info.mask[i * n + i] = 1;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return info;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
Ngram::Ngram(size_t capacity, const Param& param) {
|
|
57
|
+
param_ = param;
|
|
58
|
+
nodes_.resize(capacity);
|
|
59
|
+
for (auto& node : nodes_) {
|
|
60
|
+
node_pool_.emplace_back(&node);
|
|
61
|
+
}
|
|
62
|
+
free_node_count_ = node_pool_.size();
|
|
63
|
+
root_ = getNode();
|
|
64
|
+
|
|
65
|
+
if (!(param_.branch_length > 1)) {
|
|
66
|
+
throw std::runtime_error(
|
|
67
|
+
"param_.branch_length must be greater than 1, current value: " + std::to_string(param_.branch_length));
|
|
68
|
+
}
|
|
69
|
+
if (!(param_.min_match_window_size > 0)) {
|
|
70
|
+
throw std::runtime_error(
|
|
71
|
+
"min_match_window_size must be greater than 0, current value: " + std::to_string(param_.min_match_window_size));
|
|
72
|
+
}
|
|
73
|
+
if (!(param_.min_match_window_size <= param_.max_match_window_size)) {
|
|
74
|
+
throw std::runtime_error(
|
|
75
|
+
"min_match_window_size must be less than or equal to max_match_window_size, current min_match_window_size: " +
|
|
76
|
+
std::to_string(param_.min_match_window_size) +
|
|
77
|
+
", max_match_window_size: " + std::to_string(param_.max_match_window_size));
|
|
78
|
+
}
|
|
79
|
+
if (!(param_.max_match_window_size < param_.branch_length)) {
|
|
80
|
+
throw std::runtime_error(
|
|
81
|
+
"max_match_window_size must be less than branch_length, current max_match_window_size: " +
|
|
82
|
+
std::to_string(param_.max_match_window_size) + ", branch_length: " + std::to_string(param_.branch_length));
|
|
83
|
+
}
|
|
84
|
+
if (!(param_.min_bfs_breadth > 0)) {
|
|
85
|
+
throw std::runtime_error(
|
|
86
|
+
"min_bfs_breadth must be greater than 0, current value: " + std::to_string(param_.min_bfs_breadth));
|
|
87
|
+
}
|
|
88
|
+
if (!(param_.min_bfs_breadth <= param_.max_bfs_breadth)) {
|
|
89
|
+
throw std::runtime_error(
|
|
90
|
+
"min_bfs_breadth must be less than or equal to max_bfs_breadth, current min_bfs_breadth: " +
|
|
91
|
+
std::to_string(param_.min_bfs_breadth) + ", max_bfs_breadth: " + std::to_string(param_.max_bfs_breadth));
|
|
92
|
+
}
|
|
93
|
+
if (!(param_.draft_token_num > 0)) {
|
|
94
|
+
throw std::runtime_error(
|
|
95
|
+
"draft_token_num must be greater than 0, current value: " + std::to_string(param_.draft_token_num));
|
|
96
|
+
}
|
|
97
|
+
for (auto config : param_.batch_draft_token_num) {
|
|
98
|
+
if (config != std::numeric_limits<decltype(config)>::max()) {
|
|
99
|
+
if (!(config <= param_.draft_token_num)) {
|
|
100
|
+
throw std::runtime_error(
|
|
101
|
+
"batch_draft_token_num config value " + std::to_string(config) +
|
|
102
|
+
" must be less than or equal to draft_token_num: " + std::to_string(param_.draft_token_num));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
for (auto config : param_.batch_min_match_window_size) {
|
|
107
|
+
if (config != std::numeric_limits<decltype(config)>::max()) {
|
|
108
|
+
if (!(config >= param_.min_match_window_size)) {
|
|
109
|
+
throw std::runtime_error(
|
|
110
|
+
"batch_min_match_window_size config value " + std::to_string(config) +
|
|
111
|
+
" must be greater than or equal to min_match_window_size: " + std::to_string(param_.min_match_window_size));
|
|
112
|
+
}
|
|
113
|
+
if (!(config <= param_.max_match_window_size)) {
|
|
114
|
+
throw std::runtime_error(
|
|
115
|
+
"batch_min_match_window_size config value " + std::to_string(config) +
|
|
116
|
+
" must be less than or equal to max_match_window_size: " + std::to_string(param_.max_match_window_size));
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
quit_flag_ = false;
|
|
122
|
+
insert_worker_ = std::thread(&Ngram::insert, this);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
Ngram::~Ngram() {
|
|
126
|
+
quit_flag_ = true;
|
|
127
|
+
insert_queue_.close();
|
|
128
|
+
insert_worker_.join();
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
std::vector<std::pair<TrieNode*, int32_t>> Ngram::match(const std::vector<int32_t>& tokens, size_t batch_size) const {
|
|
132
|
+
auto draft_token_num = param_.get_draft_token_num(batch_size);
|
|
133
|
+
auto min_match_window_size = param_.get_min_match_window_size(batch_size);
|
|
134
|
+
auto max_match_window_size = param_.max_match_window_size;
|
|
135
|
+
std::vector<std::pair<TrieNode*, int32_t>> result;
|
|
136
|
+
result.reserve(param_.max_match_window_size - param_.min_match_window_size);
|
|
137
|
+
for (int32_t match_window_size = std::min(tokens.size(), param_.max_match_window_size);
|
|
138
|
+
match_window_size >= param_.min_match_window_size;
|
|
139
|
+
--match_window_size) {
|
|
140
|
+
auto start = tokens.data() + tokens.size() - match_window_size;
|
|
141
|
+
auto end = start + match_window_size;
|
|
142
|
+
auto cursor = root_;
|
|
143
|
+
while (start != end) {
|
|
144
|
+
auto iter = cursor->child.find(*start);
|
|
145
|
+
if (iter == cursor->child.end()) {
|
|
146
|
+
cursor = nullptr;
|
|
147
|
+
break;
|
|
148
|
+
}
|
|
149
|
+
++start;
|
|
150
|
+
cursor = iter->second;
|
|
151
|
+
}
|
|
152
|
+
if (cursor) {
|
|
153
|
+
result.emplace_back(std::make_pair(cursor, match_window_size));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
return result;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
void Ngram::squeeze(size_t count) {
|
|
160
|
+
if (!(node_pool_.size() >= free_node_count_ + count)) {
|
|
161
|
+
throw std::runtime_error(
|
|
162
|
+
"Insufficient node size to release required nodes. "
|
|
163
|
+
"available to release: " +
|
|
164
|
+
std::to_string(node_pool_.size() - free_node_count_) + ", required to release: " + std::to_string(count));
|
|
165
|
+
}
|
|
166
|
+
while (count--) {
|
|
167
|
+
auto last = global_lru_.back();
|
|
168
|
+
global_lru_.pop_back();
|
|
169
|
+
|
|
170
|
+
if (!last->child.empty()) {
|
|
171
|
+
throw std::runtime_error("The node to be released still has child nodes and cannot be released. ");
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
last->parent->lru.erase(last->parent_lru_pos);
|
|
175
|
+
last->parent->sorted_children.erase(last);
|
|
176
|
+
last->parent->child.erase(last->token);
|
|
177
|
+
|
|
178
|
+
node_pool_[free_node_count_++] = last;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
void Ngram::synchronize() const {
|
|
183
|
+
while (!insert_queue_.empty()) {
|
|
184
|
+
std::this_thread::sleep_for(std::chrono::microseconds(10));
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
void Ngram::insert() {
|
|
189
|
+
while (!quit_flag_) {
|
|
190
|
+
std::vector<int32_t> data;
|
|
191
|
+
if (!insert_queue_.dequeue(data)) {
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
const auto* token = data.data();
|
|
195
|
+
size_t size = data.size();
|
|
196
|
+
std::unique_lock<std::mutex> lock(mutex_);
|
|
197
|
+
|
|
198
|
+
for (size_t i = 0; i + param_.min_match_window_size < size; ++i) {
|
|
199
|
+
auto start = token + i;
|
|
200
|
+
auto end = start + std::min(size - i, param_.branch_length);
|
|
201
|
+
|
|
202
|
+
if (end - start > free_node_count_) {
|
|
203
|
+
squeeze(end - start - free_node_count_);
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
TrieNode* cursor = root_;
|
|
207
|
+
path_.clear();
|
|
208
|
+
while (start != end) {
|
|
209
|
+
auto token = *start;
|
|
210
|
+
auto iter = cursor->child.find(token);
|
|
211
|
+
if (iter == cursor->child.end()) {
|
|
212
|
+
iter = cursor->child.insert({token, getNode()}).first;
|
|
213
|
+
auto node = iter->second;
|
|
214
|
+
|
|
215
|
+
cursor->lru.emplace_front(node);
|
|
216
|
+
global_lru_.emplace_back(node);
|
|
217
|
+
|
|
218
|
+
node->token = token;
|
|
219
|
+
node->parent = cursor;
|
|
220
|
+
node->parent_lru_pos = cursor->lru.begin();
|
|
221
|
+
node->global_lru_pos = --global_lru_.end();
|
|
222
|
+
node->freq = 1;
|
|
223
|
+
cursor->sorted_children.insert(node);
|
|
224
|
+
} else {
|
|
225
|
+
auto node = iter->second;
|
|
226
|
+
cursor->sorted_children.erase(node);
|
|
227
|
+
node->freq++;
|
|
228
|
+
cursor->sorted_children.insert(node);
|
|
229
|
+
cursor->lru.splice(cursor->lru.begin(), cursor->lru, node->parent_lru_pos);
|
|
230
|
+
}
|
|
231
|
+
cursor = iter->second;
|
|
232
|
+
path_.emplace_back(cursor);
|
|
233
|
+
++start;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
for (auto it = path_.rbegin(); it != path_.rend(); ++it) {
|
|
237
|
+
TrieNode* node = *it;
|
|
238
|
+
global_lru_.splice(global_lru_.begin(), global_lru_, node->global_lru_pos);
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
void Ngram::asyncInsert(std::vector<std::vector<int32_t>>&& tokens) {
|
|
245
|
+
for (auto&& token : tokens) {
|
|
246
|
+
insert_queue_.enqueue(std::move(token));
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
Ngram::Result Ngram::matchBFS(const std::vector<int32_t>& tokens, size_t batch_size) const {
|
|
251
|
+
std::vector<std::pair<TrieNode*, int32_t>> nodes = match(tokens, batch_size);
|
|
252
|
+
|
|
253
|
+
double bfs_breadth_scale = double(param_.max_bfs_breadth - param_.min_bfs_breadth) /
|
|
254
|
+
(param_.max_match_window_size - param_.min_match_window_size + 1);
|
|
255
|
+
|
|
256
|
+
auto draft_token_num = param_.get_draft_token_num(batch_size);
|
|
257
|
+
std::vector<Node> tree(draft_token_num + 1);
|
|
258
|
+
int root = 0;
|
|
259
|
+
int cursor = 1;
|
|
260
|
+
|
|
261
|
+
for (auto [node, depth] : nodes) {
|
|
262
|
+
std::queue<std::tuple<int32_t, double, const TrieNode*>> queue; // parent, bfs_breadth, node
|
|
263
|
+
queue.push({root, (param_.max_match_window_size - depth) * bfs_breadth_scale + param_.min_bfs_breadth, node});
|
|
264
|
+
while (queue.size() && cursor <= draft_token_num) {
|
|
265
|
+
auto front = queue.front();
|
|
266
|
+
queue.pop();
|
|
267
|
+
|
|
268
|
+
auto parent = std::get<0>(front);
|
|
269
|
+
auto cur_breadth = std::get<1>(front);
|
|
270
|
+
auto iter = std::get<2>(front)->lru.begin();
|
|
271
|
+
|
|
272
|
+
auto breadth = std::max(1, int32_t(cur_breadth));
|
|
273
|
+
for (int i = 0; i < breadth && iter != std::get<2>(front)->lru.end() && cursor <= draft_token_num; ++i, ++iter) {
|
|
274
|
+
auto token = (*iter)->token;
|
|
275
|
+
auto pos = -1;
|
|
276
|
+
if (auto tit = tree[parent].next.find(token); tit != tree[parent].next.end()) {
|
|
277
|
+
pos = tit->second;
|
|
278
|
+
} else {
|
|
279
|
+
pos = tree[parent].next.insert(std::make_pair(token, cursor++)).first->second;
|
|
280
|
+
}
|
|
281
|
+
queue.emplace(pos, cur_breadth - bfs_breadth_scale, *iter);
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
return fillResult(tokens.back(), draft_token_num + 1, tree, root);
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
Ngram::Result Ngram::matchProb(const std::vector<int32_t>& tokens, size_t batch_size) const {
|
|
290
|
+
std::vector<std::pair<TrieNode*, int32_t>> nodes = match(tokens, batch_size);
|
|
291
|
+
auto draft_token_num = param_.get_draft_token_num(batch_size);
|
|
292
|
+
|
|
293
|
+
struct CompareByLastDouble {
|
|
294
|
+
bool operator()(
|
|
295
|
+
const std::tuple<double, const TrieNode*, double>& a, // parent_pos, node, final_prob
|
|
296
|
+
const std::tuple<double, const TrieNode*, double>& b) const {
|
|
297
|
+
return std::get<2>(a) < std::get<2>(b);
|
|
298
|
+
}
|
|
299
|
+
};
|
|
300
|
+
|
|
301
|
+
std::priority_queue<
|
|
302
|
+
std::tuple<double, const TrieNode*, double>,
|
|
303
|
+
std::vector<std::tuple<double, const TrieNode*, double>>,
|
|
304
|
+
CompareByLastDouble>
|
|
305
|
+
heap;
|
|
306
|
+
|
|
307
|
+
std::vector<Node> tree(draft_token_num + 1);
|
|
308
|
+
|
|
309
|
+
int root = 0;
|
|
310
|
+
int cursor = 1;
|
|
311
|
+
int top_k = param_.max_bfs_breadth;
|
|
312
|
+
|
|
313
|
+
auto addToHeap = [&heap, &top_k](int parent, const TrieNode* trie_node, double prob) -> void {
|
|
314
|
+
double sum_freq = 0.0;
|
|
315
|
+
int count = 0;
|
|
316
|
+
std::list<std::pair<TrieNode*, int32_t>> topk_children;
|
|
317
|
+
for (auto* child : trie_node->sorted_children) {
|
|
318
|
+
sum_freq += static_cast<double>(child->freq);
|
|
319
|
+
topk_children.emplace_back(child, child->freq);
|
|
320
|
+
if (++count >= top_k) break;
|
|
321
|
+
}
|
|
322
|
+
if (sum_freq <= 0) sum_freq = 1.0;
|
|
323
|
+
for (const auto& [child, freq] : topk_children) {
|
|
324
|
+
double norm_freq = static_cast<double>(freq) / sum_freq * prob;
|
|
325
|
+
heap.emplace(parent, child, norm_freq);
|
|
326
|
+
}
|
|
327
|
+
};
|
|
328
|
+
|
|
329
|
+
for (auto [node, _] : nodes) {
|
|
330
|
+
addToHeap(root, node, 1.0);
|
|
331
|
+
|
|
332
|
+
while (!heap.empty() && cursor <= draft_token_num) {
|
|
333
|
+
auto [parent, trie_node, prob] = heap.top(); // parent_pos, node, final_prob
|
|
334
|
+
heap.pop();
|
|
335
|
+
auto token = trie_node->token;
|
|
336
|
+
int pos = -1;
|
|
337
|
+
auto tit = tree[parent].next.find(token);
|
|
338
|
+
if (tit != tree[parent].next.end()) {
|
|
339
|
+
pos = tit->second;
|
|
340
|
+
} else {
|
|
341
|
+
pos = cursor++;
|
|
342
|
+
tree[parent].next[token] = pos;
|
|
343
|
+
}
|
|
344
|
+
addToHeap(pos, trie_node, prob);
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
return fillResult(tokens.back(), draft_token_num + 1, tree, root);
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
Ngram::Result Ngram::batchMatch(const std::vector<std::vector<int32_t>>& tokens) const {
|
|
352
|
+
std::unique_lock<std::mutex> lock(mutex_);
|
|
353
|
+
Result merged_result;
|
|
354
|
+
auto match_func = param_.match_type == "BFS" ? &Ngram::matchBFS : &Ngram::matchProb;
|
|
355
|
+
for (const auto& tks : tokens) {
|
|
356
|
+
Result res = (this->*match_func)(tks, tokens.size());
|
|
357
|
+
merged_result.token.insert(merged_result.token.end(), res.token.begin(), res.token.end());
|
|
358
|
+
merged_result.mask.insert(merged_result.mask.end(), res.mask.begin(), res.mask.end());
|
|
359
|
+
}
|
|
360
|
+
return merged_result;
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
void Ngram::Result::truncate(size_t n) {
|
|
364
|
+
if (n < token.size()) {
|
|
365
|
+
int full_n = token.size();
|
|
366
|
+
for (int i = 1; i < n; ++i) {
|
|
367
|
+
memcpy(&mask[i * n], &mask[i * full_n], sizeof(mask[0]) * n);
|
|
368
|
+
}
|
|
369
|
+
token.resize(n);
|
|
370
|
+
mask.resize(n * n);
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
} // namespace ngram
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
3
|
+
#include <cstddef>
|
|
4
|
+
#include <cstdint>
|
|
5
|
+
#include <functional>
|
|
6
|
+
#include <list>
|
|
7
|
+
#include <mutex>
|
|
8
|
+
#include <set>
|
|
9
|
+
#include <sstream>
|
|
10
|
+
#include <thread>
|
|
11
|
+
#include <tuple>
|
|
12
|
+
#include <unordered_map>
|
|
13
|
+
#include <vector>
|
|
14
|
+
|
|
15
|
+
#include "param.h"
|
|
16
|
+
#include "queue.h"
|
|
17
|
+
|
|
18
|
+
namespace ngram {
|
|
19
|
+
|
|
20
|
+
struct TrieNode {
|
|
21
|
+
std::unordered_map<int32_t, TrieNode*> child;
|
|
22
|
+
std::list<TrieNode*>::const_iterator global_lru_pos;
|
|
23
|
+
std::list<TrieNode*>::const_iterator parent_lru_pos;
|
|
24
|
+
int32_t token;
|
|
25
|
+
TrieNode* parent;
|
|
26
|
+
std::list<TrieNode*> lru;
|
|
27
|
+
int32_t freq = 0;
|
|
28
|
+
|
|
29
|
+
struct CompareByFreq {
|
|
30
|
+
bool operator()(TrieNode* a, TrieNode* b) const {
|
|
31
|
+
return std::tie(b->freq, a->token, a) < std::tie(a->freq, b->token, b);
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
std::multiset<TrieNode*, CompareByFreq> sorted_children;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
class Ngram {
|
|
38
|
+
std::vector<TrieNode> nodes_;
|
|
39
|
+
std::vector<TrieNode*> node_pool_;
|
|
40
|
+
size_t free_node_count_;
|
|
41
|
+
std::list<TrieNode*> global_lru_;
|
|
42
|
+
TrieNode* root_;
|
|
43
|
+
std::vector<TrieNode*> path_;
|
|
44
|
+
Param param_;
|
|
45
|
+
|
|
46
|
+
std::vector<std::pair<TrieNode*, int32_t>> match(const std::vector<int32_t>& tokens, size_t batch_size) const;
|
|
47
|
+
|
|
48
|
+
void squeeze(size_t count);
|
|
49
|
+
|
|
50
|
+
TrieNode* getNode() {
|
|
51
|
+
auto node = node_pool_[--free_node_count_];
|
|
52
|
+
node->~TrieNode();
|
|
53
|
+
new (node) TrieNode();
|
|
54
|
+
return node;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
mutable std::mutex mutex_;
|
|
58
|
+
bool quit_flag_;
|
|
59
|
+
utils::Queue<std::vector<int32_t>> insert_queue_;
|
|
60
|
+
std::thread insert_worker_;
|
|
61
|
+
std::vector<std::tuple<int32_t, int32_t, int32_t, int32_t>> match_tmp_data_;
|
|
62
|
+
|
|
63
|
+
public:
|
|
64
|
+
Ngram(size_t capacity, const Param& param);
|
|
65
|
+
Ngram() = default;
|
|
66
|
+
~Ngram();
|
|
67
|
+
|
|
68
|
+
static Ngram& instance() {
|
|
69
|
+
static Ngram instance;
|
|
70
|
+
return instance;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
void synchronize() const;
|
|
74
|
+
|
|
75
|
+
void asyncInsert(std::vector<std::vector<int32_t>>&& tokens);
|
|
76
|
+
|
|
77
|
+
struct Result {
|
|
78
|
+
std::vector<int32_t> token;
|
|
79
|
+
std::vector<uint8_t> mask;
|
|
80
|
+
|
|
81
|
+
void truncate(size_t n);
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
Result batchMatch(const std::vector<std::vector<int32_t>>& tokens) const;
|
|
85
|
+
|
|
86
|
+
void reset() {
|
|
87
|
+
std::unique_lock<std::mutex> lock(mutex_);
|
|
88
|
+
|
|
89
|
+
global_lru_.clear();
|
|
90
|
+
path_.clear();
|
|
91
|
+
node_pool_.clear();
|
|
92
|
+
for (auto& node : nodes_) {
|
|
93
|
+
node_pool_.emplace_back(&node);
|
|
94
|
+
}
|
|
95
|
+
free_node_count_ = node_pool_.size();
|
|
96
|
+
root_ = getNode();
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
const Param& param() const {
|
|
100
|
+
return param_;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
private:
|
|
104
|
+
Result matchBFS(const std::vector<int32_t>& tokens, size_t batch_size) const;
|
|
105
|
+
Result matchProb(const std::vector<int32_t>& tokens, size_t batch_size) const;
|
|
106
|
+
|
|
107
|
+
void insert();
|
|
108
|
+
};
|
|
109
|
+
|
|
110
|
+
} // namespace ngram
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
|
|
3
|
+
import logging
|
|
4
|
+
import os
|
|
5
|
+
from typing import List, Tuple
|
|
6
|
+
|
|
7
|
+
import numpy as np
|
|
8
|
+
from torch.utils.cpp_extension import load
|
|
9
|
+
|
|
10
|
+
logger = logging.getLogger(__name__)
|
|
11
|
+
|
|
12
|
+
_abs_path = os.path.dirname(os.path.abspath(__file__))
|
|
13
|
+
ngram_cache_cpp = load(
|
|
14
|
+
name="ngram_cache_cpp",
|
|
15
|
+
sources=[
|
|
16
|
+
f"{_abs_path}/ngram_cache_binding.cpp",
|
|
17
|
+
f"{_abs_path}/ngram.cpp",
|
|
18
|
+
],
|
|
19
|
+
extra_cflags=["-O3", "-std=c++20"],
|
|
20
|
+
)
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
class NgramCache:
|
|
24
|
+
def __init__(
|
|
25
|
+
self,
|
|
26
|
+
branch_length=18,
|
|
27
|
+
min_match_window_size=1,
|
|
28
|
+
max_match_window_size=10,
|
|
29
|
+
min_bfs_breadth=1,
|
|
30
|
+
max_bfs_breadth=8,
|
|
31
|
+
draft_token_num=8,
|
|
32
|
+
match_type="BFS",
|
|
33
|
+
capacity=1000000,
|
|
34
|
+
):
|
|
35
|
+
param = ngram_cache_cpp.Param()
|
|
36
|
+
param.branch_length = branch_length
|
|
37
|
+
param.min_match_window_size = min_match_window_size
|
|
38
|
+
param.max_match_window_size = max_match_window_size
|
|
39
|
+
param.min_bfs_breadth = min_bfs_breadth
|
|
40
|
+
param.max_bfs_breadth = max_bfs_breadth
|
|
41
|
+
param.draft_token_num = draft_token_num
|
|
42
|
+
param.match_type = match_type
|
|
43
|
+
self.cache = ngram_cache_cpp.Ngram(capacity, param)
|
|
44
|
+
|
|
45
|
+
self.default_mask = np.ones((1, 1), dtype=np.int64)
|
|
46
|
+
self.draft_token_num = draft_token_num
|
|
47
|
+
|
|
48
|
+
def batch_put(self, batch_tokens: List[List[int]]):
|
|
49
|
+
self.cache.asyncInsert(batch_tokens)
|
|
50
|
+
|
|
51
|
+
def synchronize(self):
|
|
52
|
+
self.cache.synchronize()
|
|
53
|
+
|
|
54
|
+
def reset(self):
|
|
55
|
+
self.cache.reset()
|
|
56
|
+
|
|
57
|
+
def batch_get(self, batch_tokens: List[List[int]]) -> Tuple[np.ndarray, np.ndarray]:
|
|
58
|
+
result = self.cache.batchMatch(batch_tokens)
|
|
59
|
+
return np.array(result.token), np.array(result.mask)
|
|
60
|
+
|
|
61
|
+
def leaf_paths_from_mask(
|
|
62
|
+
self, tokens: List[int], tree_mask: List[List[int]]
|
|
63
|
+
) -> List[List[int]]:
|
|
64
|
+
"""
|
|
65
|
+
Find all leaf paths according to the binary tree_mask (i.e., paths that are not prefixes of any other path).
|
|
66
|
+
|
|
67
|
+
Args:
|
|
68
|
+
mask : List[List[int]] # nxn binary matrix
|
|
69
|
+
tokens : List[int] # token list corresponding to columns
|
|
70
|
+
|
|
71
|
+
Returns:
|
|
72
|
+
List[List[int]] # token lists of only the leaf paths, preserving their order of appearance
|
|
73
|
+
"""
|
|
74
|
+
|
|
75
|
+
row_sets = [
|
|
76
|
+
(i, {idx for idx, v in enumerate(row) if v == 1})
|
|
77
|
+
for i, row in enumerate(tree_mask)
|
|
78
|
+
]
|
|
79
|
+
leaf_sets = []
|
|
80
|
+
leaf_rows = []
|
|
81
|
+
|
|
82
|
+
for i, cur_set in reversed(row_sets):
|
|
83
|
+
if any(cur_set <= kept for kept in leaf_sets):
|
|
84
|
+
continue
|
|
85
|
+
leaf_sets.append(cur_set)
|
|
86
|
+
leaf_rows.append(i)
|
|
87
|
+
|
|
88
|
+
leaf_rows.reverse()
|
|
89
|
+
result = []
|
|
90
|
+
for r in leaf_rows:
|
|
91
|
+
path = [tokens[col] for col in range(len(tokens)) if tree_mask[r][col] == 1]
|
|
92
|
+
result.append(path)
|
|
93
|
+
|
|
94
|
+
return result
|
|
95
|
+
|
|
96
|
+
def debug_result(
|
|
97
|
+
self, decoding_ids: np.ndarray, decoding_masks: np.ndarray, tokenizer=None
|
|
98
|
+
):
|
|
99
|
+
decoding_ids = decoding_ids.reshape(-1, self.draft_token_num)
|
|
100
|
+
decoding_masks = decoding_masks.reshape(
|
|
101
|
+
-1, self.draft_token_num, self.draft_token_num
|
|
102
|
+
)
|
|
103
|
+
logger.info(f"\n{decoding_ids=}\n{decoding_masks=}")
|
|
104
|
+
for i in range(decoding_ids.shape[0]):
|
|
105
|
+
leaf_paths = self.leaf_paths_from_mask(
|
|
106
|
+
decoding_ids[i].tolist(), decoding_masks[i].tolist()
|
|
107
|
+
)
|
|
108
|
+
if tokenizer is None:
|
|
109
|
+
logger.info(f"draft path {i}: {leaf_paths}")
|
|
110
|
+
else:
|
|
111
|
+
logger.info(f"result {i}:")
|
|
112
|
+
for leaf_path in leaf_paths:
|
|
113
|
+
logger.info(
|
|
114
|
+
f"draft path {i}: {leaf_path} -> {tokenizer.decode(leaf_path, ensure_ascii=False)}"
|
|
115
|
+
)
|
|
116
|
+
|
|
117
|
+
|
|
118
|
+
# main function
|
|
119
|
+
if __name__ == "__main__":
|
|
120
|
+
format = f"%(levelname)s %(asctime)s %(filename)s:%(lineno)d] %(message)s"
|
|
121
|
+
logging.basicConfig(
|
|
122
|
+
level=logging.DEBUG,
|
|
123
|
+
format=format,
|
|
124
|
+
datefmt="%Y-%m-%d %H:%M:%S",
|
|
125
|
+
force=True,
|
|
126
|
+
)
|
|
127
|
+
|
|
128
|
+
token_ids = [
|
|
129
|
+
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
|
|
130
|
+
[1, 2, 3, 44, 55, 66, 77, 88, 99, 100],
|
|
131
|
+
]
|
|
132
|
+
cache = NgramCache(branch_length=12, draft_token_num=8)
|
|
133
|
+
cache.batch_put(token_ids)
|
|
134
|
+
|
|
135
|
+
cache.synchronize()
|
|
136
|
+
decoding_ids, decoding_masks = cache.batch_get([[1, 2, 3], [3, 44], [3, 6, 999]])
|
|
137
|
+
|
|
138
|
+
cache.debug_result(decoding_ids, decoding_masks)
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
#include <pybind11/pybind11.h>
|
|
2
|
+
#include <pybind11/stl.h>
|
|
3
|
+
|
|
4
|
+
#include "ngram.h"
|
|
5
|
+
|
|
6
|
+
PYBIND11_MODULE(ngram_cache_cpp, m) {
|
|
7
|
+
using namespace ngram;
|
|
8
|
+
namespace py = pybind11;
|
|
9
|
+
m.doc() = "";
|
|
10
|
+
|
|
11
|
+
py::class_<Ngram>(m, "Ngram")
|
|
12
|
+
.def(py::init<size_t, const Param&>(), py::arg("capacity"), py::arg("param"))
|
|
13
|
+
.def("asyncInsert", &Ngram::asyncInsert, "")
|
|
14
|
+
.def("batchMatch", &Ngram::batchMatch, "")
|
|
15
|
+
.def("reset", &Ngram::reset, "")
|
|
16
|
+
.def("synchronize", &Ngram::synchronize, "");
|
|
17
|
+
|
|
18
|
+
py::class_<Param>(m, "Param")
|
|
19
|
+
.def(py::init<>())
|
|
20
|
+
.def_readwrite("enable", &Param::enable)
|
|
21
|
+
.def_readwrite("enable_router_mode", &Param::enable_router_mode)
|
|
22
|
+
.def_readwrite("min_bfs_breadth", &Param::min_bfs_breadth)
|
|
23
|
+
.def_readwrite("max_bfs_breadth", &Param::max_bfs_breadth)
|
|
24
|
+
.def_readwrite("min_match_window_size", &Param::min_match_window_size)
|
|
25
|
+
.def_readwrite("max_match_window_size", &Param::max_match_window_size)
|
|
26
|
+
.def_readwrite("branch_length", &Param::branch_length)
|
|
27
|
+
.def_readwrite("draft_token_num", &Param::draft_token_num)
|
|
28
|
+
.def_readwrite("match_type", &Param::match_type)
|
|
29
|
+
.def_readwrite("batch_min_match_window_size", &Param::batch_min_match_window_size)
|
|
30
|
+
.def_readwrite("batch_draft_token_num", &Param::batch_draft_token_num)
|
|
31
|
+
.def("get_draft_token_num", &Param::get_draft_token_num, "")
|
|
32
|
+
.def("get_min_match_window_size", &Param::get_min_match_window_size, "")
|
|
33
|
+
.def("parse", &Param::parse, "")
|
|
34
|
+
.def("resetBatchMinMatchWindowSize", &Param::resetBatchMinMatchWindowSize, "")
|
|
35
|
+
.def("resetBatchReturnTokenNum", &Param::resetBatchReturnTokenNum, "")
|
|
36
|
+
.def("detail", &Param::detail, "");
|
|
37
|
+
|
|
38
|
+
py::class_<Ngram::Result>(m, "Result")
|
|
39
|
+
.def(py::init<>())
|
|
40
|
+
.def_readwrite("token", &Ngram::Result::token)
|
|
41
|
+
.def_readwrite("mask", &Ngram::Result::mask)
|
|
42
|
+
.def("truncate", &Ngram::Result::truncate);
|
|
43
|
+
}
|