Skip to content

Commit 065b2d2

Browse files
Merge remote-tracking branch 'origin/master' into custom-is-finite
2 parents 91dfdb5 + 87d1c13 commit 065b2d2

35 files changed

+272
-142
lines changed

cmake/FindDpctl.cmake

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,8 @@
1717
#
1818

1919
if(NOT Dpctl_FOUND)
20-
set(_find_extra_args)
21-
if(Dpctl_FIND_REQUIRED)
22-
list(APPEND _find_extra_args REQUIRED)
23-
endif()
24-
if(Dpctl_FIND_QUIET)
25-
list(APPEND _find_extra_args QUIET)
26-
endif()
27-
find_package(PythonInterp ${_find_extra_args})
28-
find_package(PythonLibs ${_find_extra_args})
20+
find_package(Python 3.9 REQUIRED
21+
COMPONENTS Interpreter Development.Module)
2922

3023
if(PYTHON_EXECUTABLE)
3124
execute_process(COMMAND "${PYTHON_EXECUTABLE}"

conda-recipe/run_test.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"%PYTHON%" -c "import dpctl; print(dpctl.__version__)"
44
if errorlevel 1 exit 1
55

6-
"%PYTHON%" -c "import dpctl; dpctl.lsplatform()"
6+
"%PYTHON%" -m dpctl -f
77
if errorlevel 1 exit 1
88

9-
python -m pytest -q -p no:faulthandler -ra --disable-warnings --pyargs dpctl -vv
9+
python -m pytest -q -ra --disable-warnings --pyargs dpctl -vv
1010
if errorlevel 1 exit 1

conda-recipe/run_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
set -e
44

55
${PYTHON} -c "import dpctl; print(dpctl.__version__)"
6-
${PYTHON} -c "import dpctl; dpctl.lsplatform(verbosity=2)"
7-
${PYTHON} -m pytest -q -ra --disable-warnings -p no:faulthandler --cov dpctl --cov-report term-missing --pyargs dpctl -vv
6+
${PYTHON} -m dpctl -f
7+
${PYTHON} -m pytest -q -ra --disable-warnings --cov dpctl --cov-report term-missing --pyargs dpctl -vv

dpctl/_sycl_context.pyx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ cdef class SyclContext(_SyclContext):
114114
ctx = dpctl.SyclContext()
115115
print(ctx.get_devices())
116116
117-
- Invoking the constuctor with a specific filter string that creates a
117+
- Invoking the constructor with a specific filter string that creates a
118118
context for the device corresponding to the filter string.
119119
120120
:Example:
@@ -127,7 +127,7 @@ cdef class SyclContext(_SyclContext):
127127
d = ctx.get_devices()[0]
128128
assert(d.is_gpu)
129129
130-
- Invoking the constuctor with a :class:`dpctl.SyclDevice` object
130+
- Invoking the constructor with a :class:`dpctl.SyclDevice` object
131131
creates a context for that device.
132132
133133
:Example:
@@ -141,7 +141,7 @@ cdef class SyclContext(_SyclContext):
141141
d = ctx.get_devices()[0]
142142
assert(d.is_gpu)
143143
144-
- Invoking the constuctor with a list of :class:`dpctl.SyclDevice`
144+
- Invoking the constructor with a list of :class:`dpctl.SyclDevice`
145145
objects creates a common context for all the devices. This
146146
constructor call is especially useful when creation a context for
147147
multiple sub-devices.
@@ -159,7 +159,7 @@ cdef class SyclContext(_SyclContext):
159159
ctx = dpctl.SyclContext(sub_devices)
160160
assert(len(ctx.get_devices) == len(sub_devices))
161161
162-
- Invoking the constuctor with a named ``PyCapsule`` with name
162+
- Invoking the constructor with a named ``PyCapsule`` with name
163163
**"SyclContextRef"** that carries a pointer to a ``sycl::context``
164164
object. The capsule will be renamed upon successful consumption
165165
to ensure one-time use. A new named capsule can be constructed by
@@ -430,7 +430,7 @@ cdef class SyclContext(_SyclContext):
430430
return num_devs
431431
else:
432432
raise ValueError(
433-
"An error was encountered quering the number of devices "
433+
"An error was encountered querying the number of devices "
434434
"associated with this context"
435435
)
436436

dpctl/_sycl_device.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ cdef class SyclDevice(_SyclDevice):
11631163
def create_sub_devices(self, **kwargs):
11641164
"""create_sub_devices(partition=parition_spec)
11651165
Creates a list of sub-devices by partitioning a root device based on the
1166-
provided partion specifier.
1166+
provided partition specifier.
11671167
11681168
A partition specifier must be provided using a "partition"
11691169
keyword argument. Possible values for the specifier are: an int, a

dpctl/_sycl_event.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ cdef class SyclEvent(_SyclEvent):
119119
# Create a default SyclEvent
120120
e = dpctl.SyclEvent()
121121
122-
- Invoking the constuctor with a named ``PyCapsule`` with name
122+
- Invoking the constructor with a named ``PyCapsule`` with name
123123
**"SyclEventRef"** that carries a pointer to a ``sycl::event``
124124
object. The capsule will be renamed upon successful consumption
125125
to ensure one-time use. A new named capsule can be constructed by

dpctl/_sycl_queue.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ cdef class SyclQueue(_SyclQueue):
246246
# create a queue for each sub-device using the common context
247247
queues = [dpctl.SyclQueue(ctx, sub_d) for sub_d in sub_devices]
248248
249-
- Invoking the constuctor with a named ``PyCapsule`` with the name
249+
- Invoking the constructor with a named ``PyCapsule`` with the name
250250
**"SyclQueueRef"** that carries a pointer to a ``sycl::queue``
251251
object. The capsule will be renamed upon successful consumption
252252
to ensure one-time use. A new named capsule can be constructed by

dpctl/_sycl_timer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ class SyclTimer:
3737
q = dpctl.SyclQueue(property='enable_profiling')
3838
3939
# create the timer
40-
miliseconds_sc = 1e-3
41-
timer = dpctl.SyclTimer(time_scale = miliseconds_sc)
40+
milliseconds_sc = 1e-3
41+
timer = dpctl.SyclTimer(time_scale = milliseconds_sc)
4242
4343
# use the timer
4444
with timer(queue=q):
4545
code_block
4646
47-
# retrieve elapsed times in miliseconds
47+
# retrieve elapsed times in milliseconds
4848
sycl_dt, wall_dt = timer.dt
4949
5050
Remark:

dpctl/apis/include/dpctl4pybind11.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,12 +742,12 @@ class usm_memory : public py::object
742742
return nullptr;
743743
}
744744

745-
auto convertor =
745+
auto converter =
746746
::dpctl::detail::dpctl_capi::get().as_usm_memory_pyobj();
747747

748748
py::object res;
749749
try {
750-
res = convertor(py::handle(o));
750+
res = converter(py::handle(o));
751751
} catch (const py::error_already_set &e) {
752752
return nullptr;
753753
}

dpctl/memory/_memory.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ cdef void copy_via_host(void *dest_ptr, SyclQueue dest_queue,
9292
void *src_ptr, SyclQueue src_queue, size_t nbytes):
9393
"""
9494
Copies `nbytes` bytes from `src_ptr` USM memory to
95-
`dest_ptr` USM memory using host as the intemediary.
95+
`dest_ptr` USM memory using host as the intermediary.
9696
9797
This is useful when `src_ptr` and `dest_ptr` are bound to incompatible
9898
SYCL contexts.

0 commit comments

Comments
 (0)