Skip to content

[misc] Fix setup.py condition to avoid AMD from being mistaken with CPU #13022

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
merged 2 commits into from
Feb 11, 2025
Merged

[misc] Fix setup.py condition to avoid AMD from being mistaken with CPU #13022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74bb395
Update setup.py
khluu Feb 10, 2025
7e2170d
fix
khluu Feb 10, 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
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ def load_module_from_path(module_name, path):
"so vLLM may not be able to run correctly", sys.platform)
VLLM_TARGET_DEVICE = "empty"
elif (sys.platform.startswith("linux") and torch.version.cuda is None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, Sorry that I missed ROCm before. I belive add the condition here torch.version.hip is None will fix the issue.

elif (sys.platform.startswith("linux") and torch.version.cuda is None
and torch.version.hip is None
and os.getenv("VLLM_TARGET_DEVICE") is None):
    # if cuda or hip is not available and VLLM_TARGET_DEVICE is not set,
    # fallback to cpu
    VLLM_TARGET_DEVICE = "cpu"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @wangxiyuan ! I've updated the PR with your fix

and os.getenv("VLLM_TARGET_DEVICE") is None):
# if cuda is not available and VLLM_TARGET_DEVICE is not set,
and os.getenv("VLLM_TARGET_DEVICE") is None
and torch.version.hip is None):
# if cuda or hip is not available and VLLM_TARGET_DEVICE is not set,
# fallback to cpu
VLLM_TARGET_DEVICE = "cpu"

Expand Down