[Refactor] Unify torch profiler for omni and diffusion models (#2099)
Signed-off-by: gcanlin <canlinguosdu@gmail.com> Signed-off-by: Samit <285365963@qq.com> Co-authored-by: Samit <285365963@qq.com> Co-authored-by: lishunyang lishunyang12@163.com
This commit is contained in:
28 files changed
+1063
-404
No files matched your search
@@ -36,13 +36,13 @@ from vllm_omni.diffusion.distributed.parallel_state import (
|
||||
from vllm_omni.diffusion.forward_context import set_forward_context
|
||||
from vllm_omni.diffusion.ipc import pack_diffusion_output_shm
|
||||
from vllm_omni.diffusion.lora.manager import DiffusionLoRAManager
|
||||
from vllm_omni.diffusion.profiler import CurrentProfiler
|
||||
from vllm_omni.diffusion.request import OmniDiffusionRequest
|
||||
from vllm_omni.diffusion.sched.interface import DiffusionSchedulerOutput
|
||||
from vllm_omni.diffusion.worker.diffusion_model_runner import DiffusionModelRunner
|
||||
from vllm_omni.diffusion.worker.utils import RunnerOutput
|
||||
from vllm_omni.lora.request import LoRARequest
|
||||
from vllm_omni.platforms import current_omni_platform
|
||||
from vllm_omni.profiler import OmniTorchProfilerWrapper, create_omni_profiler
|
||||
from vllm_omni.worker.gpu_memory_utils import get_process_gpu_memory
|
||||
|
||||
logger = init_logger(__name__)
|
||||
@@ -83,6 +83,15 @@ class DiffusionWorker:
|
||||
od_config=self.od_config,
|
||||
device=self.device,
|
||||
)
|
||||
# Initialize profiler if configured
|
||||
self.profiler: OmniTorchProfilerWrapper | None = None
|
||||
profiler_config = self.od_config.profiler_config
|
||||
if profiler_config and profiler_config.profiler == "torch":
|
||||
self.profiler = create_omni_profiler(
|
||||
profiler_config=profiler_config,
|
||||
worker_name=f"diffusion_worker_{self.rank}",
|
||||
local_rank=self.local_rank,
|
||||
)
|
||||
if not skip_load_model:
|
||||
self.load_model(load_format=self.od_config.diffusion_load_format)
|
||||
self.init_lora_manager()
|
||||
@@ -174,15 +183,32 @@ class DiffusionWorker:
|
||||
"""Generate output for the given requests."""
|
||||
return self.execute_model(request, self.od_config)
|
||||
|
||||
@classmethod
|
||||
def start_profile(cls, trace_path_template: str) -> str:
|
||||
"""Start profiling for this GPU worker."""
|
||||
return CurrentProfiler.start(trace_path_template)
|
||||
def profile(self, is_start: bool = True, profile_prefix: str | None = None) -> None:
|
||||
"""Start or stop profiling for this GPU worker.
|
||||
|
||||
@classmethod
|
||||
def stop_profile(cls) -> dict | None:
|
||||
"""Stop profiling and return the result dictionary."""
|
||||
return CurrentProfiler.stop()
|
||||
Args:
|
||||
is_start: True to start profiling, False to stop.
|
||||
profile_prefix: Optional prefix for trace filename (vLLM compat).
|
||||
|
||||
Note:
|
||||
Matches vLLM's worker.profile() signature for consistency.
|
||||
Traces are saved automatically via on_trace_ready callback.
|
||||
"""
|
||||
if self.profiler is None:
|
||||
logger.warning("Profiler not initialized, skipping profile(%s)", is_start)
|
||||
return
|
||||
|
||||
if is_start:
|
||||
from vllm_omni.profiler import OmniTorchProfilerWrapper
|
||||
|
||||
if isinstance(self.profiler, OmniTorchProfilerWrapper):
|
||||
import time
|
||||
|
||||
filename = profile_prefix or f"diffusion_{int(time.time())}"
|
||||
self.profiler.set_trace_filename(filename)
|
||||
self.profiler.start()
|
||||
else:
|
||||
self.profiler.stop()
|
||||
|
||||
def execute_model(self, req: OmniDiffusionRequest, od_config: OmniDiffusionConfig) -> DiffusionOutput:
|
||||
"""Execute a forward pass by delegating to the model runner."""
|
||||
|
||||
Reference in new issue
Block a user