Merge branch 'jose/minor-fortran-stub-cleanup' into 'main'

More improvements to Fortran stubs and interfaces

See merge request slepc/slepc!668

Author: joseeroman

config/packages/sowing.py

@@ -19,7 +19,7 @@ def __init__(self,argdb,log):
     self.downloadable = True
     self.inplace      = False
     #self.gitcommit    = '3a410fa51a7bb531676f16deb8bc0c1ded8293c3'
-    self.version      = '1.1.26.11'
+    self.version      = '1.1.26.12'
     obj = self.version if hasattr(self,'version') else self.gitcommit
     self.url          = 'https://bitbucket.org/petsc/pkg-sowing/get/'+('v'+obj if hasattr(self,'version') else obj)+'.tar.gz'
     self.archive      = 'sowing-'+obj+'.tar.gz'
@@ -69,7 +69,7 @@ def Process(self,slepcconf,slepcvars,slepcrules,slepc,petsc,archdir=''):
         self.log.write('Using BFORT='+bfort)
         sys.path.insert(0, os.path.abspath(os.path.join('lib','slepc','bin','maint')))
         import generatefortranstubs
-        generatefortranstubs.main(slepc.dir,'' if self.inplace else petsc.archname,bfort,os.path.join(slepc.dir,'src'),0)
+        generatefortranstubs.main(slepc.dir,'' if self.inplace else petsc.archname,bfort,slepc.dir,0)
         generatefortranstubs.processf90interfaces(slepc.dir,'' if self.inplace else petsc.archname,0)
       except:
         self.log.Exit('Try configuring with --download-sowing or use a Git version of PETSc')

include/slepc/private/slepcimpl.h

@@ -17,7 +17,7 @@
 
 SLEPC_INTERN PetscBool SlepcBeganPetsc;
 
-/*@C
+/*MC
     SlepcHeaderCreate - Creates a SLEPc object
 
     Input Parameters:
@@ -37,7 +37,7 @@ SLEPC_INTERN PetscBool SlepcBeganPetsc;
     has been called.
 
     Level: developer
-@*/
+M*/
 #define SlepcHeaderCreate(h,classid,class_name,descr,mansec,comm,destroy,view) \
     ((PetscErrorCode)((!SlepcInitializeCalled && \
                        PetscError(comm,__LINE__,PETSC_FUNCTION_NAME,__FILE__,PETSC_ERR_ORDER,PETSC_ERROR_INITIAL, \

lib/slepc/bin/maint/generatefortranstubs.py

@@ -28,7 +28,7 @@ def findLineCol(filename, string):
 
   data = re.subn('\00','',data)[0]
   data = re.subn('\nvoid ','\nSLEPC_EXTERN void ',data)[0]
-  data = re.subn('\nPetscErrorCode ','\nSLEPC_EXTERN void ',data)[0]
+  data = re.subn('\n[ ]*PetscErrorCode ','\nSLEPC_EXTERN void ',data)[0]
   data = re.subn(r'Petsc([ToRm]*)Pointer\(int\)','Petsc\\1Pointer(void*)',data)[0]
   data = re.subn(r'PetscToPointer\(a\) \(a\)','PetscToPointer(a) (a ? *(PetscFortranAddr *)(a) : 0)',data)[0]
   data = re.subn(r'PetscFromPointer\(a\) \(int\)\(a\)','PetscFromPointer(a) (PetscFortranAddr)(a)',data)[0]
@@ -115,6 +115,10 @@ def FixDir(petscdir,petscarch,parentdir,dir,verbose):
     if line.find('MANSEC') >=0 and not line.find('SUBMANSEC') >=0:
       mansec = line.split('=')[1].lower().strip()
 
+  # this is a hack for the include directory and will be wrong for any
+  # non-sys static include functions
+  if mansec == 'unknown': mansec = 'sys'
+  if submansec == 'unknown': submansec = 'sys'
   if not bfortsubmansec == 'unknown':
     submansec = bfortsubmansec
 
@@ -135,7 +139,6 @@ def FixDir(petscdir,petscarch,parentdir,dir,verbose):
       txt = fd.read()
       fd.close()
       if txt:
-        if mansec == 'unknown': raise RuntimeError("Cannot have unknown mansec in " + parentdir)
         if mansec in ['bv','ds','fn','rg','st']:
           basedir = os.path.join(petscdir,petscarch,'src','sys','classes',mansec,'f90-mod','ftn-auto-interfaces')
         else:
@@ -165,6 +168,7 @@ def processDir(petscdir, petscarch, bfort, verbose, dirpath, dirnames, filenames
   ''' Runs bfort on a directory and then fixes the files generated by bfort including moving generated F90 fortran interface files'''
   if not dirpath.startswith(petscdir): raise RuntimeError("Error, the directory being processed "+dirpath+" does not begin with SLEPC_DIR "+petscdir)
   sdirpath = dirpath.replace(petscdir+'/','')
+  if sdirpath == 'include': sdirpath = os.path.join('src','sys')
   outdir = os.path.join(petscdir,petscarch,sdirpath,'ftn-auto')
   if filenames:
     PrepFtnDir(outdir)
@@ -263,10 +267,11 @@ def processf90interfaces(petscdir,petscarch,verbose):
   return
 
 def main(petscdir,petscarch,bfort,dir,verbose):
-  for dirpath, dirnames, filenames in os.walk(dir, topdown=True):
-    filenames = [i for i in filenames if not i.find('#') > -1 and os.path.splitext(i)[1] in ['.c','.h','.cxx','.cu']]
-    dirnames[:] = [d for d in dirnames if d not in ['output','tutorials','tests','binding','benchmarks'] and not d.startswith('ftn-') and not d.startswith('f90-')]
-    processDir(petscdir, petscarch,bfort, verbose, dirpath, dirnames, filenames)
+  for p in [ os.path.join(dir,'include'), os.path.join(dir,'src') ]:
+    for dirpath, dirnames, filenames in os.walk(p, topdown=True):
+      filenames = [i for i in filenames if not i.find('#') > -1 and os.path.splitext(i)[1] in ['.c','.h','.cxx','.cu']]
+      dirnames[:] = [d for d in dirnames if d not in ['output', 'binding', 'tests', 'tutorials', 'yaml']]
+      processDir(petscdir, petscarch,bfort, verbose, dirpath, dirnames, filenames)
   return
 #
 # generatefortranstubs bfortexectuable -verbose            -----  generates fortran stubs for a directory and all its children
@@ -312,5 +317,5 @@ def not_empty(v):
     assert isinstance(args.bfort, (list, tuple))
     bfort_exec = args.bfort[0]
     assert isinstance(bfort_exec, str)
-    ret = main(args.slepc_dir, args.petsc_arch, bfort_exec, os.path.join(args.slepc_dir, 'src'), args.verbose)
+    ret = main(args.slepc_dir, args.petsc_arch, bfort_exec, args.slepc_dir, args.verbose)
   sys.exit(ret)

lib/slepc/conf/bfort-petsc.txt

@@ -3,9 +3,12 @@
 # petscao.h
 nativeptr AO
 
-# petscbag.h
+# petscbag.h  This is not a PETSc object
 nativeptr PetscBag
 
+# this is not a PETSc object
+native PetscSFNode
+
 # petscdt.h
 native    PetscDTNodeType
 
@@ -46,8 +49,6 @@ native    DMDALocalInfo
 native    DMDAInterpolationType
 native    DMDAElementType
 
-nativeptr PetscGLL
-
 # dmlabel.h
 nativeptr DMLabel
 
@@ -144,7 +145,6 @@ native    MatSTRUMPACKCompressionType
 
 # petscpc.h
 nativeptr PC
-nativeptr PCType
 
 native    PCSide
 native    PCJacobiType
@@ -176,7 +176,7 @@ nativeptr PetscConvEst
 native    SNESConvergedReason
 native    SNESLineSearchReason
 nativeptr MatMFFD
-nativeptr MatMFFDType
+native    MatMFFDType
 nativeptr SNESLineSearch
 native    SNESLineSearchOrder
 native    SNESNormSchedule