Skip to content

Commit 07533bf

Browse files
jameskermodejameskermode
authored
Merge pull request #328 from itpplasma/fix/add-missing-makefile-meson
Add missing Makefile.meson for Direct-C testing
2 parents bf21ad3 + 424fa2e commit 07533bf

16 files changed

Lines changed: 205 additions & 43 deletions

File tree

‎examples/Makefile‎

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,31 @@ EXAMPLES = \
7070

7171
DIRECTC ?= no
7272

73+
# Examples with known Direct-C limitations (expected to fail in DIRECTC=yes mode)
74+
# These are NOT skipped - they run and failures are allowed only in Direct-C mode
75+
DIRECTC_EXPECTED_FAILURES = \
76+
arrays \
77+
arrays_in_derived_types_issue50 \
78+
default_i8 \
79+
derivedtypes \
80+
derivedtypes_procedure \
81+
dump_package \
82+
fixed_1D_derived_type_array_argument \
83+
fortran_oo \
84+
issue235_allocatable_classes \
85+
issue261_array_shapes \
86+
issue301_complex_types \
87+
issue302_pointer_warning \
88+
issue306_allocatable_realloc \
89+
issue41_abstract_classes \
90+
keep_single_interface \
91+
keyword_renaming_issue160 \
92+
long_subroutine_name \
93+
method_optional \
94+
mockderivetype \
95+
strings \
96+
callback_print_function_issue93
97+
7398
all: test
7499

75100
test:
@@ -107,14 +132,40 @@ clean_directc:
107132
$(MAKE) clean_meson
108133

109134
test_meson:
135+
@FAILED="" ; \
136+
EXPECTED_FAILED="" ; \
110137
for example in ${EXAMPLES}; do \
111-
echo "" ; \
112-
echo "" ; \
113138
echo "" ; \
114139
echo "# ---------------------------------------------------" ; \
115-
echo "running make test in $$example" ; \
116-
make -C $$example -f Makefile.meson PYTHON=$(PYTHON) DIRECTC=$(DIRECTC) test || echo "FAILED: $$example" ; \
117-
done
140+
echo "Testing: $$example" ; \
141+
if make -C $$example -f Makefile.meson PYTHON=$(PYTHON) DIRECTC=$(DIRECTC) test; then \
142+
echo "PASS: $$example" ; \
143+
else \
144+
IS_EXPECTED=no ; \
145+
if [ "$(DIRECTC)" = "yes" ] && echo " ${DIRECTC_EXPECTED_FAILURES} " | grep -q " $$example "; then \
146+
IS_EXPECTED=yes ; \
147+
echo "EXPECTED FAIL (Direct-C limitation): $$example" ; \
148+
EXPECTED_FAILED="$$EXPECTED_FAILED $$example" ; \
149+
fi ; \
150+
if [ "$$IS_EXPECTED" = "no" ]; then \
151+
echo "FAIL: $$example" ; \
152+
FAILED="$$FAILED $$example" ; \
153+
fi ; \
154+
fi ; \
155+
done ; \
156+
echo "" ; \
157+
echo "========================================" ; \
158+
if [ -n "$$EXPECTED_FAILED" ]; then \
159+
echo "Expected failures:$$EXPECTED_FAILED" ; \
160+
fi ; \
161+
if [ -n "$$FAILED" ]; then \
162+
echo "UNEXPECTED FAILURES:$$FAILED" ; \
163+
echo "========================================" ; \
164+
exit 1 ; \
165+
else \
166+
echo "All tests passed (or expected failures only)" ; \
167+
echo "========================================" ; \
168+
fi
118169

119170
clean_meson:
120171
for example in ${EXAMPLES}; do \

‎examples/callback_print_function_issue93/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ all: _${PYTHON_MODN}.so _${PYTHON_MODN}_pkg.so test
8181

8282

8383
clean:
84-
-rm ${LIBSRC_OBJECTS} ${LIBSRC_FPP_FILES} libsrc.a _${PYTHON_MODN}*.so \
85-
*.mod *.fpp f90wrap*.f90 f90wrap*.o *.o
84+
-rm -rf ${LIBSRC_OBJECTS} ${LIBSRC_FPP_FILES} libsrc.a _${PYTHON_MODN}*.so \
85+
*.mod *.fpp f90wrap*.f90 f90wrap*.o *.o build/ ${PYTHON_MODN}.py ${PYTHON_MODN}_pkg/
8686

8787

8888
.f90.o:
@@ -107,8 +107,9 @@ _${PYTHON_MODN}.so: libsrc.a ${LIBSRC_FPP_FILES}
107107

108108

109109
_${PYTHON_MODN}_pkg.so: libsrc.a ${LIBSRC_FPP_FILES}
110+
rm -rf build/ # Clean meson build directory before second module
110111
f90wrap -m ${PYTHON_MODN}_pkg ${LIBSRC_WRAP_FPP_FILES} -k ${KIND_MAP} -v -P --callback pyfunc_print
111112
f2py-f90wrap $(F2PYFLAGS) -c -m _${PYTHON_MODN}_pkg -L. -lsrc f90wrap*.f90 ${LIBSRC_WRAP_FILES}
112113

113114
test: _${PYTHON_MODN}_pkg.so _${PYTHON_MODN}.so
114-
${PYTHON} tests.py
115+
${PYTHON} -X faulthandler tests.py

‎examples/callback_print_function_issue93/Makefile.meson‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
include ../make.meson.inc
1+
# Callback examples require special build steps (static library, --callback flag)
2+
# that make.meson.inc doesn't support. Delegate to the regular Makefile.
23

3-
NAME := CBF
4-
NAME2 := CBF_pkg
5-
MAKEFILE := $(lastword $(MAKEFILE_LIST))
4+
test:
5+
$(MAKE) -f Makefile test
66

7-
test: build2
8-
$(PYTHON) tests.py
9-
10-
build2: build
11-
$(MAKE) -f $(MAKEFILE) build NAME=$(NAME2) WRAPFLAGS="$(WRAPFLAGS) -P"
12-
13-
clean:
14-
$(MAKE) -f $(MAKEFILE) clean NAME=$(NAME)
15-
$(MAKE) -f $(MAKEFILE) clean NAME=$(NAME2)
7+
clean:
8+
$(MAKE) -f Makefile clean

‎examples/callback_print_function_issue93/tests.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,27 @@
3939
class TestExample(unittest.TestCase):
4040

4141
def setUp(self):
42-
4342
pass
4443

45-
@unittest.skipIf(sys.version_info[:2] == (3, 10),
46-
"f2py callback issue on Python 3.10")
4744
def test_basic(self):
45+
"""Test f2py callbacks through cross-module Fortran calls.
46+
47+
Note: Do NOT call write_message directly before calling through caller
48+
module. The f2py callback wrapper has a bug where it stores the callback
49+
context in thread-local storage but doesn't restore it after the call
50+
returns. This leaves a dangling pointer that causes segfaults when the
51+
callback is invoked through a different path (e.g., via caller module).
52+
53+
See: https://github.com/jameskermode/f90wrap/issues/93
54+
"""
4855
print(CBF._CBF.cback.write_message.__doc__)
49-
def f(msg):
56+
def f(msg):
5057
print("Yo! " + msg)
5158
CBF._CBF.pyfunc_print = f
52-
# We need to prime the callback with a call "under the hood", not sure why.
53-
CBF._CBF.cback.write_message('blah')
54-
# Subsequently other calls to higher level functions work.
59+
# Call through caller module - this works correctly
5560
CBF.caller.test_write_msg()
5661
CBF.caller.test_write_msg()
5762
CBF.caller.test_write_msg_2()
58-
# TODO?
59-
# CBF.caller.test_return_msg()
60-
# CBF.caller.test_return_msg()
61-
# CBF.caller.test_return_msg_2()
6263

6364
if __name__ == '__main__':
6465
unittest.main()

‎examples/f2py_string_input/Makefile.meson‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# f2py_string_input: Pure f2py example (not f90wrap)
2+
# This example tests f2py directly, not f90wrap, so it doesn't use meson build
3+
4+
test:
5+
@echo "Skipping: f2py_string_input is a pure f2py example, not f90wrap"
6+
7+
clean:
8+
@true

‎examples/issue206_subroutine_oldstyle/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test: all
1010
$(PYTHON) run.py
1111

1212
clean:
13-
rm -f *.o f90wrap*.f *.so *.mod
13+
rm -f *.o f90wrap*.f f90wrap*.f90 *.so *.mod
1414
rm -rf src.*/
1515
rm -rf itest/
1616
-rm -rf src.*/ .f2py_f2cmap .libs/ __pycache__/ build/

‎examples/issue227_allocatable/run.py‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,41 @@ def test_type_output_wrapper(self):
2727

2828
@unittest.skipIf(re.search("nvfortran", os.environ.get('F90', '')), "Fails with nvfortran")
2929
def test_memory_leak(self):
30+
# Run multiple rounds to detect real memory leaks vs one-time overhead.
31+
# Python's weakref.finalize uses a dict that doesn't shrink after pop(),
32+
# but the memory IS reused. A real leak would show growth between rounds.
33+
num_objects = 8192
34+
35+
def run_round():
36+
t = []
37+
for i in range(num_objects):
38+
t.append(itest.alloc_output.alloc_output_type_func(VAL))
39+
del t
40+
gc.collect()
41+
42+
# Round 1: warm up (allocates dict space)
3043
gc.collect()
31-
t = []
44+
run_round()
45+
46+
# Round 2: measure baseline after warmup
3247
tracemalloc.start()
33-
start_snapshot = tracemalloc.take_snapshot()
34-
for i in range(8192):
35-
t.append(itest.alloc_output.alloc_output_type_func(VAL))
36-
del t
37-
gc.collect()
38-
end_snapshot = tracemalloc.take_snapshot()
48+
baseline = tracemalloc.take_snapshot()
49+
run_round()
50+
after_round2 = tracemalloc.take_snapshot()
51+
52+
# Round 3: check for growth
53+
run_round()
54+
after_round3 = tracemalloc.take_snapshot()
3955
tracemalloc.stop()
40-
stats = end_snapshot.compare_to(start_snapshot, 'lineno')
41-
self.assertLess(sum(stat.size_diff for stat in stats), 4096)
56+
57+
# Memory should not grow significantly between rounds 2 and 3
58+
# (allowing small overhead for tracemalloc itself)
59+
diff_r2 = sum(s.size_diff for s in after_round2.compare_to(baseline, 'lineno'))
60+
diff_r3 = sum(s.size_diff for s in after_round3.compare_to(after_round2, 'lineno'))
61+
62+
# Round 2 may have some growth from tracemalloc overhead, but round 3
63+
# should show no significant growth - a real leak would grow each round
64+
self.assertLess(diff_r3, 4096, f"Memory grew between rounds: {diff_r3} bytes")
4265

4366
if __name__ == '__main__':
4467
unittest.main()

‎examples/issue235_allocatable_classes/run.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
import gc
23
import unittest
34
from itest import mytype, myclass, myclass_factory
45

@@ -19,6 +20,7 @@ def test_create_destroy_type_object(self):
1920
self.assertTrue(abs(obj.val - REF) < TOL)
2021

2122
del obj
23+
gc.collect()
2224

2325
self.assertEqual(mytype.create_count, 1)
2426
self.assertGreaterEqual(mytype.destroy_count, 1)
@@ -50,6 +52,7 @@ def test_create_destroy_class_object(self):
5052
self.assertTrue(abs(obj.get_val() - REF) < TOL)
5153

5254
del obj
55+
gc.collect()
5356

5457
self.assertEqual(myclass.create_count, 1)
5558
self.assertGreaterEqual(myclass.destroy_count, 1)

‎examples/issue261_array_shapes/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ f90wrap_%.f90 %.py: %.o %.f90
1717
f90wrap -m $* $*.f90 -v
1818

1919
%.o: %.f90
20-
$(FC) $(FCFLAGS) -c -g -O0 $< -o $@
20+
$(F90) $(F90FLAGS) -c -g -O0 $< -o $@
2121

2222
clean:
2323
rm -f *.o f90wrap*.f90 *.so *.mod *.x .f2py_f2cmap

‎examples/issue261_array_shapes/Makefile.meson‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include ../make.meson.inc
2+
3+
NAME := array_shapes
4+
5+
test: build
6+
$(PYTHON) test.py

0 commit comments

Comments
 (0)