ENH: Add templates for f2py c functions and handle more C types #25260
Conversation
|
@Pranavchiku now that #25226 is in, could you rebase this and address the test failures? |
9b71de9 to
0170e08
Compare
|
@Pranavchiku, the problem is essentially in the way the ❯ diff meson_works/codditymodule.c meson_broken/codditymodule.c
2c2
< * This file is auto-generated with f2py (version:2.0.0.dev0+git20231224.a43c068).
---
> * This file is auto-generated with f2py (version:2.0.0.dev0+git20231222.94d21b0).
5c5
< * Generation date: Sun Dec 24 18:19:50 2023
---
> * Generation date: Sun Dec 24 18:24:33 2023
140a141,152
> static int
> float_from_pyobj(float* v, PyObject *obj, const char *errmess)
> {
> double d=0.0;
> if (double_from_pyobj(&d,obj,errmess)) {
> *v = (float)d;
> return 1;
> }
> return 0;
> }
>
>
170c182
< void (*f2py_func)(double*,double*,double*)) {
---
> void (*f2py_func)(float*,float*,float*)) {
175c187
< double a = 0;
---
> float a = 0;
177c189
< double b = 0;
---
> float b = 0;
179c191
< double c = 0;
---
> float c = 0;
192c204
< f2py_success = double_from_pyobj(&a,a_capi,"coddity.coddity.c_add() 1st argument (a) can't be converted to double");
---
> f2py_success = float_from_pyobj(&a,a_capi,"coddity.coddity.c_add() 1st argument (a) can't be converted to float");
195c207
< f2py_success = double_from_pyobj(&b,b_capi,"coddity.coddity.c_add() 2nd argument (b) can't be converted to double");
---
> f2py_success = float_from_pyobj(&b,b_capi,"coddity.coddity.c_add() 2nd argument (b) can't be converted to float");
214c226
< capi_buildvalue = Py_BuildValue("d",c);
---
> capi_buildvalue = Py_BuildValue("f",c);
298c310
< s = PyUnicode_FromString("2.0.0.dev0+git20231224.a43c068");
---
> s = PyUnicode_FromString("2.0.0.dev0+git20231222.94d21b0");
302c314
< "This module 'coddity' is auto-generated with f2py (version:2.0.0.dev0+git20231224.a43c068).\nFunctions:\n"
---
> "This module 'coddity' is auto-generated with f2py (version:2.0.0.dev0+git20231222.94d21b0).\nFunctions:\n"
306c318
< s = PyUnicode_FromString("2.0.0.dev0+git20231224.a43c068");
---
> s = PyUnicode_FromString("2.0.0.dev0+git20231222.94d21b0");For this test case (extracted from the module coddity
use iso_c_binding, only: c_double, c_int, c_int64_t
implicit none
contains
subroutine c_add(a, b, c) bind(c, name="c_add")
real(c_double), intent(in) :: a, b
real(c_double), intent(out) :: c
c = a + b
end subroutine c_add
end module coddityThe steps to reproduce this (and other similar errors) is: micromamba activate numpy-dev
spin run $SHELL
cd gh-25229 # or wherever the file is
f2py -m coddity -c coddity.f90 --build-dir blah --backend meson
# Modify the files after inspectionAnother thing to do is to use meld to visually diff whole folders at once, between working and non-working variants. |
| needs['int64_t_from_pyobj'] = ['long_from_pyobj'] | ||
| cfuncs['int64_t_from_pyobj'] = """ | ||
| static int | ||
| int64_t_from_pyobj(int64_t* v, PyObject *obj, const char *errmess) { | ||
| long i = 0; | ||
| if (long_from_pyobj(&i, obj, errmess)) { | ||
| *v = (int64_t)i; | ||
| return 1; | ||
| } | ||
| return 0; | ||
| } | ||
| """ |
There was a problem hiding this comment.
@Pranavchiku could you check (in light of the previous comment) which of these need to be explicitly written out and which can be just type cast? I suppose it might be best to just have each one handled explicitly, if only to get the C++ types correct in the function signatures....
There was a problem hiding this comment.
Done, we already have ones for float/double_complex so I skipped both. I am not sure about how to add it for bool hence skipped it.
|
Thank you @HaoZeke, I'll apply code review by tonight. |
|
Tests pass locally for me. |
Closes #25229.
This PR has commits from #25226, we'll wait till it gets merged.