20231088/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CI/Build][CPU][Bugfix] Fix CPU CI (#12150)

Browse Source 
Signed-off-by: jiang1.li <jiang1.li@intel.com>
This commit is contained in:
Li, Jiang 2025-01-17 19:39:52 +08:00 committed by GitHub
parent 07934cc237
commit d4e6194570
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.buildkite/run-cpu-test.sh
View File

@ -83,6 +83,6 @@ function cpu_tests() {
tests/lora/test_qwen2vl.py" tests/lora/test_qwen2vl.py"
} }
# All of CPU tests are expected to be finished less than 25 mins. # All of CPU tests are expected to be finished less than 40 mins.
export -f cpu_tests export -f cpu_tests
timeout 30m bash -c "cpu_tests $CORE_RANGE $NUMA_NODE" timeout 40m bash -c "cpu_tests $CORE_RANGE $NUMA_NODE"

8
vllm/model_executor/layers/activation.py
View File

@ -30,8 +30,10 @@ class FatreluAndMul(CustomOp):
def __init__(self, threshold: float = 0.): def __init__(self, threshold: float = 0.):
super().__init__() super().__init__()
self.threshold = threshold self.threshold = threshold
if current_platform.is_cuda_alike() or current_platform.is_cpu(): if current_platform.is_cuda_alike():
self.op = torch.ops._C.fatrelu_and_mul self.op = torch.ops._C.fatrelu_and_mul
elif current_platform.is_cpu():
self._forward_method = self.forward_native
def forward_native(self, x: torch.Tensor) -> torch.Tensor: def forward_native(self, x: torch.Tensor) -> torch.Tensor:
d = x.shape[-1] // 2 d = x.shape[-1] // 2
@ -100,11 +102,13 @@ class MulAndSilu(CustomOp):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
if current_platform.is_cuda_alike() or current_platform.is_cpu(): if current_platform.is_cuda_alike():
self.op = torch.ops._C.mul_and_silu self.op = torch.ops._C.mul_and_silu
elif current_platform.is_xpu(): elif current_platform.is_xpu():
from vllm._ipex_ops import ipex_ops from vllm._ipex_ops import ipex_ops
self.op = ipex_ops.silu_and_mul self.op = ipex_ops.silu_and_mul
elif current_platform.is_cpu():
self._forward_method = self.forward_native
def forward_native(self, x: torch.Tensor) -> torch.Tensor: def forward_native(self, x: torch.Tensor) -> torch.Tensor:
"""PyTorch-native implementation equivalent to forward().""" """PyTorch-native implementation equivalent to forward()."""