Commit9458741

committed

rename chunked_mode to chunked_logits

Signed-off-by: Yibin Li <109242046+yibinl-nvidia@users.noreply.github.com>

1 parent9788010 commit9458741Copy full SHA for 9458741

File tree

2 files changed

+14

-13

lines changed

tensorrt_llm/_torch/pyexecutor
- handle_logits.py
- llm_request.py

2 files changed

+14

-13

lines changed

`‎tensorrt_llm/_torch/pyexecutor/handle_logits.py‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ def __call__(`
`80`	`80`	`1,beam_width,-1)`
`81`	`81`	`llm_req.py_result.append_generation_logits(logits_view)`
`82`	`82`
`83`		`-# Finalize any remaining logits transfers for all requests(chunked mode)`
	`83`	`+# Finalize any remaining logits transfers for all requestsinchunked mode`
`84`	`84`	`forllm_reqinchain(context_requests,generation_requests):`
`85`		`-ifllm_req.py_return_generation_logitsorllm_req.py_return_context_logits:`
`86`		`-llm_req.py_result.post_processing_transfer()`
	`85`	`+ifllm_req.py_use_chunked_logits:`
	`86`	`+ifllm_req.py_return_generation_logitsorllm_req.py_return_context_logits:`
	`87`	`+llm_req.py_result.post_processing_transfer()`

`‎tensorrt_llm/_torch/pyexecutor/llm_request.py‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def __init__(self,`
`45`	`45`	`seq_length:int,`
`46`	`46`	`use_device_memory=True,`
`47`	`47`	`should_exclude_last=False,`
`48`		`-chunked_mode=False,`
	`48`	`+use_chunked_logits=False,`
`49`	`49`	`streaming=False,`
`50`	`50`	`chunk_size=8):`
`51`	`51`	`ifshould_exclude_last:`
`@@ -55,7 +55,7 @@ def __init__(self,`
`55`	`55`	`self.seq_length=seq_length`
`56`	`56`	`self.use_device_memory=use_device_memory`
`57`	`57`	`self._should_exclude_last=should_exclude_last`
`58`		`-self.chunked_mode=chunked_mode`
	`58`	`+self.use_chunked_logits=use_chunked_logits`
`59`	`59`	`self.chunk_size=chunk_size`
`60`	`60`	`self.streaming=streaming`
`61`	`61`	`self._logits_indices= []`
`@@ -66,7 +66,7 @@ def __init__(self,`
`66`	`66`	`self.vocab_size=-1`
`67`	`67`
`68`	`68`	`# Chunked mode: device-side fragments`
`69`		`-ifchunked_mode:`
	`69`	`+ifuse_chunked_logits:`
`70`	`70`	`self._device_fragments:List[torch.Tensor]= []`
`71`	`71`	`self._current_position=0`
`72`	`72`
`@@ -103,7 +103,7 @@ def append(self, logits: torch.Tensor):`
`103`	`103`	`logits=logits.unsqueeze(1)`
`104`	`104`	`assertlogits.ndim==3,f"Bad logits shape, expect [num_tokens, beam_width, vocab_size], got{logits.shape}"`
`105`	`105`
`106`		`-ifself.chunked_mode:`
	`106`	`+ifself.use_chunked_logits:`
`107`	`107`	`ifself.beam_width==-1:`
`108`	`108`	`self._init_chunked_storage(logits)`
`109`	`109`	`self._add_fragment(logits)`
`@@ -179,7 +179,7 @@ def _transfer_chunk_to_host(self):`
`179`	`179`
`180`	`180`	`deffinalize_transfer(self):`
`181`	`181`	`"""Force transfer of any remaining fragments to host (for chunked mode)"""`
`182`		`-ifself.chunked_modeandhasattr(`
	`182`	`+ifself.use_chunked_logitsandhasattr(`
`183`	`183`	`self,'_device_fragments')andself._device_fragments:`
`184`	`184`	`self._transfer_chunk_to_host()`
`185`	`185`
`@@ -241,20 +241,20 @@ def __init__(self,`
`241`	`241`	`return_context_logits:bool=False,`
`242`	`242`	`return_generation_logits:bool=False,`
`243`	`243`	`exclude_last_generation_logits:bool=False,`
`244`		`-chunked_mode:bool=False,`
	`244`	`+use_chunked_logits:bool=True,`
`245`	`245`	`chunk_size:int=8):`
`246`	`246`	`self._streaming=streaming`
`247`	`247`	`self._context_logits=LogitsStorage(`
`248`	`248`	`prompt_len,`
`249`	`249`	`use_device_memory,`
`250`		`-chunked_mode=chunked_mode,`
	`250`	`+use_chunked_logits=use_chunked_logits,`
`251`	`251`	`streaming=streaming,`
`252`	`252`	`chunk_size=chunk_size)ifreturn_context_logitselseNone`
`253`	`253`	`self._generation_logits=LogitsStorage(`
`254`	`254`	`max_new_tokens,`
`255`	`255`	`use_device_memory,`
`256`	`256`	`exclude_last_generation_logits,`
`257`		`-chunked_mode=chunked_mode,`
	`257`	`+use_chunked_logits=use_chunked_logits,`
`258`	`258`	`streaming=streaming,`
`259`	`259`	`chunk_size=chunk_size)ifreturn_generation_logitselseNone`
`260`	`260`	`self._log_probs=LogProbStorage()ifreturn_log_probselseNone`
`@@ -392,7 +392,7 @@ def __init__(`
`392`	`392`	`is_draft:bool=False,`
`393`	`393`	`seq_slot:Optional[int]=None,`
`394`	`394`	`target_seq_slot:Optional[int]=None,`
`395`		`-use_chunked_logits:bool=False,`
	`395`	`+use_chunked_logits:bool=True,`
`396`	`396`	`logits_chunk_size:int=8,`
`397`	`397`	`**kwargs):`
`398`	`398`
`@@ -464,7 +464,7 @@ def __init__(`
`464`	`464`	`return_context_logits,`
`465`	`465`	`return_generation_logits,`
`466`	`466`	`exclude_last_generation_logits,`
`467`		`-chunked_mode=use_chunked_logits,`
	`467`	`+use_chunked_logits=use_chunked_logits,`
`468`	`468`	`chunk_size=logits_chunk_size)`
`469`	`469`	`self.child_requests= []`
`470`	`470`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9458741

File tree

2 files changed

2 files changed

`‎tensorrt_llm/_torch/pyexecutor/handle_logits.py‎`

`‎tensorrt_llm/_torch/pyexecutor/llm_request.py‎`

0 commit comments