Skip to content

[Frontend] Remove custom_cache_manager #13791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeejeelee merged 2 commits into from
Mar 19, 2025
Merged

[Frontend] Remove custom_cache_manager #13791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf001cd
Remove custom_cache_manager
fulvius31 Feb 24, 2025
b8cc269
Merge branch 'vllm-project:main' into triton_cache
fulvius31 Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions vllm/executor/multiproc_worker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@

from vllm.config import VllmConfig
from vllm.logger import init_logger
from vllm.triton_utils.importing import HAS_TRITON
from vllm.utils import _check_multiproc_method, get_mp_context, run_method

if HAS_TRITON:
from vllm.triton_utils import maybe_set_triton_cache_manager

logger = init_logger(__name__)

T = TypeVar('T')
Expand Down Expand Up @@ -314,7 +310,3 @@ def set_multiprocessing_worker_envs(parallel_config):
current_parallelism, default_omp_num_threads)
os.environ["OMP_NUM_THREADS"] = str(default_omp_num_threads)
torch.set_num_threads(default_omp_num_threads)

# workaround for https://github.com/vllm-project/vllm/issues/6103
if HAS_TRITON and parallel_config.world_size > 1:
maybe_set_triton_cache_manager()
9 changes: 1 addition & 8 deletions vllm/triton_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@

from vllm.triton_utils.importing import HAS_TRITON

__all__ = ["HAS_TRITON"]

if HAS_TRITON:

from vllm.triton_utils.custom_cache_manager import (
maybe_set_triton_cache_manager)

__all__ += ["maybe_set_triton_cache_manager"]
__all__ = ["HAS_TRITON"]
55 changes: 0 additions & 55 deletions vllm/triton_utils/custom_cache_manager.py
View file
Open in desktop

This file was deleted.