Merge pull request numpy#27695 from HaoZeke/fixModuleF2PYdat

BUG: Fix multiple modules in F2PY and COMMON handling

Author: mattip

numpy/f2py/auxfuncs.py

@@ -43,7 +43,7 @@
     'isunsigned_long_long', 'isunsigned_long_longarray', 'isunsigned_short',
     'isunsigned_shortarray', 'l_and', 'l_not', 'l_or', 'outmess', 'replace',
     'show', 'stripcomma', 'throw_error', 'isattr_value', 'getuseblocks',
-    'process_f2cmap_dict'
+    'process_f2cmap_dict', 'containscommon'
 ]
 
 

numpy/f2py/f90mod_rules.py

@@ -97,9 +97,6 @@ def dadd(line, s=doc):
 
     usenames = getuseblocks(pymod)
     for m in findf90modules(pymod):
-        contains_functions_or_subroutines = any(
-            item for item in m["body"] if item["block"] in ["function", "subroutine"]
-        )
         sargs, fargs, efargs, modobjs, notvars, onlyvars = [], [], [], [], [
             m['name']], []
         sargsp = []
@@ -120,8 +117,9 @@ def dadd(line, s=doc):
             outmess(f"\t\t\tSkipping {m['name']} since there are no public vars/func in this module...\n")
             continue
 
-        if m['name'] in usenames and not contains_functions_or_subroutines:
-            outmess(f"\t\t\tSkipping {m['name']} since it is in 'use'...\n")
+        # gh-25186
+        if m['name'] in usenames and containscommon(m):
+            outmess(f"\t\t\tSkipping {m['name']} since it is in 'use' and contains a common block...\n")
             continue
         if onlyvars:
             outmess('\t\t  Variables: %s\n' % (' '.join(onlyvars)))

numpy/f2py/tests/src/regression/datonly.f90

@@ -0,0 +1,17 @@
+module datonly
+  implicit none
+  integer, parameter :: max_value = 100
+  real, dimension(:), allocatable :: data_array
+end module datonly
+
+module dat
+  implicit none
+  integer, parameter :: max_= 1009
+end module dat
+
+subroutine simple_subroutine(ain, aout)
+  use dat, only: max_
+  integer, intent(in) :: ain
+  integer, intent(out) :: aout
+  aout = ain + max_
+end subroutine simple_subroutine

numpy/f2py/tests/test_regression.py

@@ -24,6 +24,18 @@ def test_inout(self):
         assert np.allclose(x, [3, 1, 2])
 
 
+class TestDataOnlyMultiModule(util.F2PyTest):
+    # Check that modules without subroutines work
+    sources = [util.getpath("tests", "src", "regression", "datonly.f90")]
+
+    @pytest.mark.slow
+    def test_mdat(self):
+        assert self.module.datonly.max_value == 100
+        assert self.module.dat.max_ == 1009
+        int_in = 5
+        assert self.module.simple_subroutine(5) == 1014
+
+
 class TestNegativeBounds(util.F2PyTest):
     # Check that negative bounds work correctly
     sources = [util.getpath("tests", "src", "negative_bounds", "issue_20853.f90")]