Skip to content

Use pybind11 for C/C++ extensions #23787

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

Closed
ianthomas23 wants to merge 9 commits into from
Closed

Use pybind11 for C/C++ extensions #23787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8381ef9
Use pybind11 for qhull wrapper
ianthomas23 Aug 28, 2022
f2f597f
Use pybind11 for tri module
ianthomas23 Aug 31, 2022
cdfaf20
Add CI dependencies
ianthomas23 Aug 31, 2022
b15fd9c
Fix module wrapper
ianthomas23 Sep 1, 2022
293dffc
Avoid using -std=c++11 when compiling C files
ianthomas23 Sep 2, 2022
7da3539
Address review comments
ianthomas23 Sep 2, 2022
f8226d8
Try altering CI so pybind11 extensions build OK
ianthomas23 Sep 2, 2022
2f8cfec
Remove C++ flags when compiling C files in qhull extension
ianthomas23 Sep 4, 2022
846f4c7
More CI installation of pybind11
ianthomas23 Sep 4, 2022
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
Prev Previous commit
Next Next commit
Remove C++ flags when compiling C files in qhull extension
  • Loading branch information
@ianthomas23
ianthomas23 committed Sep 4, 2022
commit 2f8cfec1e0ed01e46c16bea057ae9b4e8eed1dcd
20 changes: 20 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ def has_flag(self, flagname):
return True


# Wrapper for distutils.ccompiler.CCompiler._compile to remove C++-specific
# flags when compiling C files.
def compile_wrapper(compiler, obj, src, ext, cc_args, extra_postargs, pp_opts):
if src.lower().endswith(".c"):
extra_postargs = list(filter(lambda x: x[1:4] != "std",
extra_postargs))
compiler._compile_old(obj, src, ext, cc_args, extra_postargs, pp_opts)


class BuildExtraLibraries(setuptools.command.build_ext.build_ext):
def finalize_options(self):
self.distribution.ext_modules[:] = [
Expand Down Expand Up @@ -184,9 +193,20 @@ def build_extension(self, ext):
orig_build_temp = self.build_temp
self.build_temp = os.path.join(self.build_temp, ext.name)
try:
if ext.name == "matplotlib._qhull":
# For qhull extension some C++ flags must be removed before
# compiling C files.
from distutils.ccompiler import CCompiler
self.compiler._compile_old = self.compiler._compile
self.compiler._compile = compile_wrapper.__get__(
self.compiler, CCompiler)
super().build_extension(ext)
finally:
self.build_temp = orig_build_temp
if ext.name == "matplotlib._qhull" and hasattr(
self.compiler, "_compile_old"):
self.compiler._compile = self.compiler._compile_old
delattr(self.compiler, "_compile_old")


def update_matplotlibrc(path):
Expand Down
2 changes: 1 addition & 1 deletion setupext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ def get_extensions(self):
# qhull
ext = Pybind11Extension(
"matplotlib._qhull", ["src/_qhull_wrapper.cpp"],
# Do not set cxx_std as C compilers do not recognise it.
cxx_std=11,

@ianthomas23 ianthomas23 Aug 31, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can specify the C++ standard to follow, so here we are explicitly restricting to C++11. This would probably be a configuration param at the top of the file to make it clear what C++ standard the project is currently working to.

define_macros=[("MPL_DEVNULL", os.devnull)])
Qhull.add_flags(ext)
yield ext
Expand Down