Skip to content

Use f-strings in tools.py #849

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 1 commit into from
Jul 8, 2025
Merged

Use f-strings in tools.py #849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions pyopencl/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,9 @@ def __call__(self):
@override
def __str__(self) -> str:
# Don't show address, so that parallel test collection works
return ("<context factory for <pyopencl.Device '%s' on '%s'>>" %
(self.device.name.strip(),
self.device.platform.name.strip()))
device = self.device.name.strip()
platform = self.device.platform.name.strip()
return f"<context factory for <pyopencl.Device '{device}' on '{platform}'>>"


DeviceOrPlatformT = TypeVar("DeviceOrPlatformT", "cl.Device", "cl.Platform")
Expand All @@ -660,7 +660,7 @@ def _find_cl_obj(
for obj in objs:
if identifier.lower() in (obj.name + " " + obj.vendor).lower():
return obj
raise RuntimeError("object '%s' not found" % identifier)
raise RuntimeError(f"object '{identifier}' not found")


def get_test_platforms_and_devices(
Expand Down Expand Up @@ -943,12 +943,12 @@ def get_arg_offset_adjuster_code(arg_types: Sequence[Argument]) -> str:

for arg_type in arg_types:
if isinstance(arg_type, VectorArg) and arg_type.with_offset:
result.append("__global %(type)s *%(name)s = "
"(__global %(type)s *) "
"((__global char *) %(name)s__base + %(name)s__offset);"
% {
"type": dtype_to_ctype(arg_type.dtype),
"name": arg_type.name})
name = arg_type.name
ctype = dtype_to_ctype(arg_type.dtype)
result.append(
f"__global {ctype} *{name} = "
f"(__global {ctype} *) "
f"((__global char *) {name}__base + {name}__offset);")

return "\n".join(result)

Expand Down Expand Up @@ -1135,9 +1135,9 @@ def match_dtype_to_c_struct(
dims_str = ""
try:
for dim in array_dims:
dims_str += "[%d]" % dim
dims_str += f"[{dim}]"
except TypeError:
dims_str = "[%d]" % array_dims
dims_str = f"[{array_dims}]"
c_fields.append(" {} {}{};".format(
dtype_to_ctype(array_dtype), field_name, dims_str)
)
Expand Down Expand Up @@ -1477,7 +1477,7 @@ def vec_arg_factory(
assert isinstance(arg[1], str)
parsed_arg = ScalarArg(self.parse_type(arg[0]), arg[1])
else:
raise TypeError("unexpected argument type: %s" % type(arg))
raise TypeError(f"unexpected argument type: {type(arg)}")

parsed_args.append(parsed_arg)

Expand Down
Loading