Skip to content

Fix formatting of errors in _sycl queue.pyx #2290

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
ndgrigorian merged 2 commits into from
Apr 23, 2026
+33 −25
Merged

Fix formatting of errors in _sycl queue.pyx #2290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c05c5d
clean up error messages
ndgrigorian Apr 21, 2026
ae1286a
Fix error formatting in _sycl_queue
ndgrigorian Apr 22, 2026
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
58 changes: 33 additions & 25 deletions dpctl/_sycl_queue.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,8 @@ cdef DPCTLSyclEventRef _memcpy_impl(
src_is_buf = True
else:
raise TypeError(
"Parameter `src` should have either type "
"`dpctl.memory._Memory` or a type that "
"supports Python buffer protocol"
"Parameter `src` should have either type `dpctl.memory._Memory` "
"or a type that supports Python buffer protocol"
)

if isinstance(dst, _Memory):
Expand All @@ -508,9 +507,8 @@ cdef DPCTLSyclEventRef _memcpy_impl(
dst_is_buf = True
else:
raise TypeError(
"Parameter `dst` should have either type "
"`dpctl.memory._Memory` or a type that "
"supports Python buffer protocol"
"Parameter `dst` should have either type `dpctl.memory._Memory` "
"or a type that supports Python buffer protocol"
)

if dep_events_count == 0 or dep_events is NULL:
Expand Down Expand Up @@ -1592,7 +1590,8 @@ cdef class SyclQueue(_SyclQueue):
else:
raise TypeError(
"dependent_events must either None, or a sequence of "
":class:`dpctl.SyclEvent` objects")
"`dpctl.SyclEvent` objects"
)
if nDE > 0:
depEvents = (
<DPCTLSyclEventRef*>malloc(nDE*sizeof(DPCTLSyclEventRef))
Expand Down Expand Up @@ -1703,25 +1702,28 @@ cdef class WorkGroupMemory:
raise RuntimeError("Workgroup memory extension not available")

if not (0 < len(args) < 3):
raise TypeError("WorkGroupMemory constructor takes 1 or 2 "
f"arguments, but {len(args)} were given")
raise TypeError(
"WorkGroupMemory constructor takes 1 or 2 arguments, but "
f"{len(args)} were given"
)

if len(args) == 1:
if not isinstance(args[0], numbers.Integral):
raise TypeError("WorkGroupMemory single argument constructor"
"expects first argument to be `int`",
f"but got {type(args[0])}")
raise TypeError(
"WorkGroupMemory single argument constructor expects "
f"first argument to be `int` but got {type(args[0])}"
)
nbytes = <size_t>(args[0])
else:
if not isinstance(args[0], str):
raise TypeError(
"WorkGroupMemory constructor expects first"
f"argument to be `str`, but got {type(args[0])}"
"WorkGroupMemory constructor expects first argument to be "
f"`str`, but got {type(args[0])}"
)
if not isinstance(args[1], numbers.Integral):
raise TypeError(
"WorkGroupMemory constructor expects second"
f"argument to be `int`, but got {type(args[1])}"
"WorkGroupMemory constructor expects second argument to "
f"be `int`, but got {type(args[1])}"
)
dtype = <str>(args[0])
count = <size_t>(args[1])
Expand Down Expand Up @@ -1800,14 +1802,16 @@ cdef class RawKernelArg:
raise RuntimeError("Raw kernel arg extension not available")

if not (0 < len(args) < 3):
raise TypeError("RawKernelArg constructor takes 1 or 2 "
f"arguments, but {len(args)} were given")
raise TypeError(
"RawKernelArg constructor takes 1 or 2 arguments, but "
f"{len(args)} were given"
)

if len(args) == 1:
if not _is_buffer(args[0]):
raise TypeError("RawKernelArg single argument constructor"
"expects argument to be buffer",
f"but got {type(args[0])}")
raise TypeError(
"RawKernelArg single argument constructor expects "
f"argument to be buffer but got {type(args[0])}")

ret_code = PyObject_GetBuffer(args[0], &(_buffer),
PyBUF_SIMPLE | PyBUF_ANY_CONTIGUOUS)
Expand All @@ -1819,11 +1823,15 @@ cdef class RawKernelArg:
_is_buf = True
else:
if not isinstance(args[0], numbers.Integral):
raise TypeError("RawKernelArg constructor expects first"
"argument to be `int`, but got {type(args[0])}")
raise TypeError(
"RawKernelArg constructor expects first argument to be "
f"`int`, but got {type(args[0])}"
)
if not isinstance(args[1], numbers.Integral):
raise TypeError("RawKernelArg constructor expects second"
"argument to be `int`, but got {type(args[1])}")
raise TypeError(
"RawKernelArg constructor expects second argument to be "
f"`int`, but got {type(args[1])}"
)

_is_buf = False
count = args[0]
Expand Down
Loading