8000 BUG, ENH: Fix ``iso_c_binding`` type maps and fix ``bind(c)`` support by charris · Pull Request #24622 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG, ENH: Fix iso_c_binding type maps and fix bind(c) support #24622

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 17 commits into from
Sep 2, 2023
Merged

BUG, ENH: Fix iso_c_binding type maps and fix bind(c) support #24622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
091e895
MAINT: fix ISO_C type maps in f2py
HaoZeke Aug 26, 2023
d3cd409
TST: Add a test for gh-24553
HaoZeke Aug 26, 2023
a765be1
DOC: Add a news fragment for iso_c_binding [f2py]
HaoZeke Aug 26, 2023
319abdb
MAINT: Rework to keep older logic
HaoZeke Aug 26, 2023
37cb475
MAINT: Move into private module
HaoZeke Aug 26, 2023
2d57c1b
MAINT: Add a kind_map for function use
HaoZeke Aug 26, 2023
6ddbace
ENH: Rework bind(c) detection
HaoZeke Aug 26, 2023
6f2caba
ENH: Add bind(c) to function subroutine bindings
HaoZeke Aug 26, 2023
8c83f84
MAINT: Do not use bind(c) for subroutine wrappers
HaoZeke Aug 26, 2023
840cae2
MAINT: Use iso_c_binding where necessary
HaoZeke Aug 26, 2023
8fad793
ENH: Load iso_c_binding module only when needed
HaoZeke Aug 26, 2023
ff652f2
MAINT: Fix regep for bind matches
HaoZeke Aug 26, 2023
aaa98e0
MAINT: More robust test for using iso_c_binding
HaoZeke Aug 26, 2023
e5080f8
MAINT: Be more forgiving with bindc matches
HaoZeke Aug 26, 2023
3755a4b
TST: Add more tests for iso_c_binding
HaoZeke Aug 26, 2023
19c3591
DOC: Add a release note
HaoZeke Aug 26, 2023
71c1a52
MAINT: Rename docstring, modify tests
HaoZeke Aug 27, 2023
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
MAINT: Rename docstring, modify tests 
Co-authored-by: mattip <mattip@users.noreply.github.com>
  • Loading branch information
@HaoZeke @mattip @charris
2 people authored and charris committed Sep 2, 2023
commit 71c1a52967490c64a7e85e69eacaf13be559056e
2 changes: 1 addition & 1 deletion numpy/f2py/auxfuncs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ def applyrules(rules, d, var={}):
return ret

def deep_merge(dict1, dict2):
"""Deep merge two dictionaries and return a new dictionary.
"""Recursively merge two dictionaries into a new dictionary.

Parameters:
- dict1: The base dictionary.
Expand Down
2 changes: 1 addition & 1 deletion numpy/f2py/tests/src/isocintrin/isoCtests.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ subroutine c_add(a, b, c) bind(c, name="c_add")
c = a + b
end subroutine c_add
! gh-9693
function wat(x, y) result(z) bind(c, name='wat')
function wat(x, y) result(z) bind(c)
integer(c_int), intent(in) :: x, y
integer(c_int) :: z

Expand Down
0