Skip to content

Remove cython pinning to < 3.1 #2443

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 5 commits into from
May 13, 2025
Merged

Remove cython pinning to < 3.1 #2443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54dc454
Disabling line tracing in dpnp/dpnp_utils/dpnp_algo_utils.pyx
antonwolfy May 12, 2025
99b61c0
Remove limitation on cython version
antonwolfy May 12, 2025
6460aad
Disable line tracing per function
antonwolfy May 12, 2025
f2c25ea
Merge branch 'master' into enable-cython-3.1
antonwolfy May 13, 2025
fca3c91
Import only used function from cython built extension to keep coverag…
antonwolfy May 13, 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
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ requirements:
- python
- setuptools
- numpy >=1.23
- cython <3.1
- cython
- cmake >=3.21
- ninja
- git
Expand Down
12 changes: 6 additions & 6 deletions dpnp/dpnp_algo/dpnp_arraycreation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import numpy

import dpnp
import dpnp.dpnp_utils as utils
from dpnp.dpnp_array import dpnp_array
from dpnp.dpnp_utils import get_usm_allocations, map_dtype_to_device

__all__ = [
"dpnp_geomspace",
Expand All @@ -60,7 +60,7 @@ def dpnp_geomspace(
endpoint=True,
axis=0,
):
usm_type_alloc, sycl_queue_alloc = utils.get_usm_allocations([start, stop])
usm_type_alloc, sycl_queue_alloc = get_usm_allocations([start, stop])

if sycl_queue is None and device is None:
sycl_queue = sycl_queue_alloc
Expand All @@ -77,7 +77,7 @@ def dpnp_geomspace(
stop = _as_usm_ndarray(stop, _usm_type, sycl_queue_normalized)

dt = numpy.result_type(start, stop, float(num))
dt = utils.map_dtype_to_device(dt, sycl_queue_normalized.sycl_device)
dt = map_dtype_to_device(dt, sycl_queue_normalized.sycl_device)
if dtype is None:
dtype = dt

Expand Down Expand Up @@ -144,7 +144,7 @@ def dpnp_linspace(
retstep=False,
axis=0,
):
usm_type_alloc, sycl_queue_alloc = utils.get_usm_allocations([start, stop])
usm_type_alloc, sycl_queue_alloc = get_usm_allocations([start, stop])

if sycl_queue is None and device is None:
sycl_queue = sycl_queue_alloc
Expand All @@ -164,7 +164,7 @@ def dpnp_linspace(
stop = _as_usm_ndarray(stop, _usm_type, sycl_queue_normalized)

dt = numpy.result_type(start, stop, float(num))
dt = utils.map_dtype_to_device(dt, sycl_queue_normalized.sycl_device)
dt = map_dtype_to_device(dt, sycl_queue_normalized.sycl_device)
if dtype is None:
dtype = dt

Expand Down Expand Up @@ -251,7 +251,7 @@ def dpnp_logspace(
axis=0,
):
if not dpnp.isscalar(base):
usm_type_alloc, sycl_queue_alloc = utils.get_usm_allocations(
usm_type_alloc, sycl_queue_alloc = get_usm_allocations(
[start, stop, base]
)

Expand Down
1 change: 1 addition & 0 deletions dpnp/dpnp_utils/dpnp_algo_utils.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ cdef tuple get_common_usm_allocation(dpnp_descriptor x1, dpnp_descriptor x2):
return (common_sycl_queue.sycl_device, common_usm_type, common_sycl_queue)


@cython.linetrace(False)
cdef (DPNPFuncType, void *) get_ret_type_and_func(DPNPFuncData kernel_data,
cpp_bool has_aspect_fp64):
"""
Expand Down
2 changes: 1 addition & 1 deletion environments/build_with_oneapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
dependencies:
- cmake
- cython <3.1
- cython
- ninja
- numpy
- pytest
Expand Down
Loading