Merge pull request #247 from Damon-Salvetore/fix/vllm-version-compat
fix: vllm-version-stable
This commit is contained in:
@@ -31,7 +31,7 @@ docker run -d --gpus all --name vibevoice-vllm \
|
|||||||
-v $(pwd):/app \
|
-v $(pwd):/app \
|
||||||
-w /app \
|
-w /app \
|
||||||
--entrypoint bash \
|
--entrypoint bash \
|
||||||
vllm/vllm-openai:latest \
|
vllm/vllm-openai:v0.14.1 \
|
||||||
-c "python3 /app/vllm_plugin/scripts/start_server.py"
|
-c "python3 /app/vllm_plugin/scripts/start_server.py"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
+32
-6
@@ -46,8 +46,13 @@ def _ffmpeg_load_file(filepath) -> tuple[np.ndarray, int]:
|
|||||||
return audio, sr
|
return audio, sr
|
||||||
|
|
||||||
# Register FFmpeg-based audio loader
|
# Register FFmpeg-based audio loader
|
||||||
import vllm.multimodal.audio as _vllm_audio_module
|
try:
|
||||||
_OriginalAudioMediaIO = _vllm_audio_module.AudioMediaIO
|
# Try new location (vLLM >= 0.6.x)
|
||||||
|
from vllm.multimodal.media.audio import AudioMediaIO as _OriginalAudioMediaIO
|
||||||
|
except ImportError:
|
||||||
|
# Fall back to old location (vLLM < 0.6.x)
|
||||||
|
import vllm.multimodal.audio as _vllm_audio_module
|
||||||
|
_OriginalAudioMediaIO = _vllm_audio_module.AudioMediaIO
|
||||||
|
|
||||||
class _PatchedAudioMediaIO(_OriginalAudioMediaIO):
|
class _PatchedAudioMediaIO(_OriginalAudioMediaIO):
|
||||||
"""AudioMediaIO implementation using FFmpeg for audio decoding."""
|
"""AudioMediaIO implementation using FFmpeg for audio decoding."""
|
||||||
@@ -62,11 +67,22 @@ class _PatchedAudioMediaIO(_OriginalAudioMediaIO):
|
|||||||
return _ffmpeg_load_file(filepath)
|
return _ffmpeg_load_file(filepath)
|
||||||
|
|
||||||
# Replace globally
|
# Replace globally
|
||||||
_vllm_audio_module.AudioMediaIO = _PatchedAudioMediaIO
|
try:
|
||||||
|
# For new vLLM versions
|
||||||
|
import vllm.multimodal.media.audio as _vllm_audio_module
|
||||||
|
_vllm_audio_module.AudioMediaIO = _PatchedAudioMediaIO
|
||||||
|
except ImportError:
|
||||||
|
# For old vLLM versions
|
||||||
|
import vllm.multimodal.audio as _vllm_audio_module
|
||||||
|
_vllm_audio_module.AudioMediaIO = _PatchedAudioMediaIO
|
||||||
|
|
||||||
# Also patch in utils module where it's imported
|
# Also patch in utils module where it's imported
|
||||||
import vllm.multimodal.utils as _vllm_utils_module
|
try:
|
||||||
_vllm_utils_module.AudioMediaIO = _PatchedAudioMediaIO
|
import vllm.multimodal.utils as _vllm_utils_module
|
||||||
|
_vllm_utils_module.AudioMediaIO = _PatchedAudioMediaIO
|
||||||
|
except (ImportError, AttributeError):
|
||||||
|
# AudioMediaIO might not be imported in utils in newer versions
|
||||||
|
pass
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
@@ -91,7 +107,17 @@ from vllm.multimodal.processing import (
|
|||||||
PromptUpdate,
|
PromptUpdate,
|
||||||
PromptUpdateDetails,
|
PromptUpdateDetails,
|
||||||
)
|
)
|
||||||
from vllm.multimodal.profiling import BaseDummyInputsBuilder, ProcessorInputs
|
try:
|
||||||
|
# Try new location (vLLM >= 0.6.x)
|
||||||
|
from vllm.multimodal.processing import BaseDummyInputsBuilder, ProcessorInputs
|
||||||
|
except ImportError:
|
||||||
|
# Fall back to old location (vLLM < 0.6.x)
|
||||||
|
try:
|
||||||
|
from vllm.multimodal.profiling import BaseDummyInputsBuilder, ProcessorInputs
|
||||||
|
except ImportError:
|
||||||
|
# If neither location works, try individual imports
|
||||||
|
from vllm.multimodal.processing.dummy_inputs import BaseDummyInputsBuilder
|
||||||
|
from vllm.multimodal.processing.inputs import ProcessorInputs
|
||||||
|
|
||||||
# Import VibeVoice components
|
# Import VibeVoice components
|
||||||
from vibevoice.modular.modular_vibevoice_tokenizer import (
|
from vibevoice.modular.modular_vibevoice_tokenizer import (
|
||||||
|
|||||||
Reference in New Issue
Block a user