[NPU] bug fix for multi stream (#15048)
This commit is contained in:
@@ -239,6 +239,7 @@ class Envs:
|
|||||||
|
|
||||||
# NPU
|
# NPU
|
||||||
SGLANG_NPU_DISABLE_ACL_FORMAT_WEIGHT = EnvBool(False)
|
SGLANG_NPU_DISABLE_ACL_FORMAT_WEIGHT = EnvBool(False)
|
||||||
|
SGLANG_NPU_USE_MULTI_STREAM = EnvBool(False)
|
||||||
|
|
||||||
# Quantization
|
# Quantization
|
||||||
SGLANG_INT4_WEIGHT = EnvBool(False)
|
SGLANG_INT4_WEIGHT = EnvBool(False)
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ from transformers import PretrainedConfig
|
|||||||
|
|
||||||
from sglang.srt.configs.model_config import is_deepseek_nsa
|
from sglang.srt.configs.model_config import is_deepseek_nsa
|
||||||
from sglang.srt.distributed import get_pp_group, get_tensor_model_parallel_world_size
|
from sglang.srt.distributed import get_pp_group, get_tensor_model_parallel_world_size
|
||||||
|
from sglang.srt.environ import envs
|
||||||
from sglang.srt.eplb.expert_distribution import get_global_expert_distribution_recorder
|
from sglang.srt.eplb.expert_distribution import get_global_expert_distribution_recorder
|
||||||
from sglang.srt.layers.attention.nsa.utils import (
|
from sglang.srt.layers.attention.nsa.utils import (
|
||||||
can_cp_split,
|
can_cp_split,
|
||||||
@@ -97,7 +98,11 @@ class DeepseekModelNextN(nn.Module):
|
|||||||
|
|
||||||
self.eh_proj = nn.Linear(2 * config.hidden_size, config.hidden_size, bias=False)
|
self.eh_proj = nn.Linear(2 * config.hidden_size, config.hidden_size, bias=False)
|
||||||
|
|
||||||
self.alt_stream = torch.cuda.Stream() if _is_cuda or _is_npu else None
|
self.alt_stream = (
|
||||||
|
torch.cuda.Stream()
|
||||||
|
if _is_cuda or envs.SGLANG_NPU_USE_MULTI_STREAM.get()
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
layer_name = "decoder"
|
layer_name = "decoder"
|
||||||
if _is_npu and (
|
if _is_npu and (
|
||||||
|
|||||||
@@ -3020,7 +3020,11 @@ class DeepseekV2Model(nn.Module):
|
|||||||
else:
|
else:
|
||||||
self.embed_tokens = PPMissingLayer()
|
self.embed_tokens = PPMissingLayer()
|
||||||
|
|
||||||
self.alt_stream = torch.cuda.Stream() if _is_cuda or _is_npu else None
|
self.alt_stream = (
|
||||||
|
torch.cuda.Stream()
|
||||||
|
if _is_cuda or envs.SGLANG_NPU_USE_MULTI_STREAM.get()
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
self.layers, self.start_layer, self.end_layer = make_layers(
|
self.layers, self.start_layer, self.end_layer = make_layers(
|
||||||
config.num_hidden_layers,
|
config.num_hidden_layers,
|
||||||
|
|||||||
Reference in New Issue
Block a user