Skip to content

Commit aa35631

Browse files
authored
merge conflict (#6)
1 parent 50fd86f commit aa35631

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

setup.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -332,20 +332,24 @@ def read_readme() -> str:
332332
def get_requirements() -> List[str]:
333333
"""Get Python package dependencies from requirements.txt."""
334334
if _is_cuda():
335-
with open(get_path("requirements.txt")) as f:
336-
requirements = f.read().strip().split("\n")
335+
requirements = _read_requirements("requirements-cuda.txt")
336+
cuda_major = torch.version.cuda.split(".")[0]
337+
modified_requirements = []
338+
for req in requirements:
339+
if "vllm-nccl-cu12" in req:
340+
modified_requirements.append(
341+
req.replace("vllm-nccl-cu12", f"vllm-nccl-cu{cuda_major}"))
342+
else:
343+
modified_requirements.append(req)
344+
requirements = modified_requirements
337345
elif _is_hip():
338-
with open(get_path("requirements-rocm.txt")) as f:
339-
requirements = f.read().strip().split("\n")
346+
requirements = _read_requirements("requirements-rocm.txt")
340347
elif _is_neuron():
341-
with open(get_path("requirements-neuron.txt")) as f:
342-
requirements = f.read().strip().split("\n")
348+
requirements = _read_requirements("requirements-neuron.txt")
343349
elif _is_cpu():
344-
with open(get_path("requirements-cpu.txt")) as f:
345-
requirements = f.read().strip().split("\n")
350+
requirements = _read_requirements("requirements-cpu.txt")
346351
elif _is_xpu():
347-
with open(get_path("requirements-xpu.txt")) as f:
348-
requirements = f.read().strip().split("\n")
352+
requirements = _read_requirements("requirements-xpu.txt")
349353
else:
350354
raise ValueError(
351355
"Unsupported platform, please use CUDA, ROCM or Neuron.")

0 commit comments

Comments
 (0)