Skip to content
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

Jump to bottom

choose_devices: don't short-circuit dev choice when answers available #780

Merged
merged 4 commits into from
Aug 28, 2024
Merged

choose_devices: don't short-circuit dev choice when answers available #780

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8da1ab8
choose_devices: don't short-circuit dev choice when answers available
matthiasdiener Aug 26, 2024
55f3e0c
print automatically chosen device
matthiasdiener Aug 28, 2024
edbff40
dont print in non-interactive case
matthiasdiener Aug 28, 2024
110d291
Merge branch 'main' into choose-dev-answer
matthiasdiener Aug 28, 2024
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
4 changes: 2 additions & 2 deletions pyopencl/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ def parse_device(choice):

if not devices:
raise Error("no devices found")
elif len(devices) == 1:
elif len(devices) == 1 and not answers:
inducer marked this conversation as resolved.
Show resolved Hide resolved
pass
else:
if not answers:
Expand All @@ -1672,7 +1672,7 @@ def parse_device(choice):

if answers:
raise RuntimeError("not all provided choices were used by "
"choose_device. (left over: '%s')" % ":".join(answers))
"choose_devices. (left over: '%s')" % ":".join(answers))

return devices

Expand Down
Loading