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

Add numpy dependency fallback necessary for cross-compilation builds #77

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Add numpy dependency fallback necessary for cross-compilation builds #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47df283
add fallback necessary for cross-compilation builds
jcapriot Oct 22, 2024
e9a7d8d
check cython version to enable free-threaded mode
jcapriot Oct 22, 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
41 changes: 39 additions & 2 deletions geoana/kernels/_extensions/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@

numpy_nodepr_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_22_API_VERSION']

# NumPy include directory
np_dep = dependency('numpy')
numpy_nodepr_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION']
np_dep = dependency('numpy', required: false)
if not np_dep.found()
# For cross-compilation it is often not possible to run the Python interpreter
# in order to retrieve numpy's include directory. It can be specified in the
# cross file instead:
# [properties]
# numpy-include-dir = /abspath/to/host-pythons/site-packages/numpy/core/include
#
# This uses the path as is, and avoids running the interpreter.
incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
if incdir_numpy == 'not-given'
incdir_numpy = run_command(py,
[
'-c',
'''import os
import numpy as np
try:
incdir = os.path.relpath(np.get_include())
except Exception:
incdir = np.get_include()
print(incdir)
'''
],
check: true
).stdout().strip()
endif
inc_np = include_directories(incdir_numpy)
np_dep = declare_dependency(include_directories: inc_np)
endif


# Deal with M_PI & friends; add `use_math_defines` to c_args or cpp_args
# Cython doesn't always get this right itself (see, e.g., gh-16800), so
Expand All @@ -15,6 +45,11 @@ endif

c_undefined_ok = ['-Wno-maybe-uninitialized']

cython_args = []
if cy.version().version_compare('>=3.1.0')
cython_args += ['-Xfreethreading_compatible=True']
endif

cython_c_args = [numpy_nodepr_api, use_math_defines]

cython_cpp_args = cython_c_args
Expand All @@ -24,6 +59,7 @@ module_path = 'geoana/kernels/_extensions'
py.extension_module(
'potential_field_prism',
'potential_field_prism.pyx',
cython_args: cython_args,
c_args: cython_c_args,
install: true,
subdir: module_path,
Expand All @@ -33,6 +69,7 @@ py.extension_module(
py.extension_module(
'rTE',
['rTE.pyx', '_rTE.cpp'],
cython_args: cython_args,
cpp_args: cython_cpp_args,
install: true,
subdir: module_path,
Expand Down