[Meson] Add Python interfaces

.cirrus.yml

@@ -9,19 +9,21 @@ task:
   dependencies_script: |
     echo $(uname)
     if [ "$(uname)" = "FreeBSD" ]; then
-      pkg install -y meson bash gcc12
+      pkg install -y py39-pip meson bash gcc12
+      pip install numpy
     else
-      brew install meson gcc
+      brew install python meson gcc
+      pip3 install numpy
     fi
     echo "GALAHAD=$CIRRUS_WORKING_DIR" >> $CIRRUS_ENV
     echo "OMP_CANCELLATION=TRUE" >> $CIRRUS_ENV
     echo "OMP_NESTED=TRUE" >> $CIRRUS_ENV
     echo "OMP_PROC_BIND=TRUE" >> $CIRRUS_ENV
   configure_script: |
     if [ "$(uname -s)" = "FreeBSD" ]; then
-      FC=gfortran12 CC=gcc12 CXX=g++12 meson setup builddir --prefix=~/galahad
+      FC=gfortran12 CC=gcc12 CXX=g++12 meson setup builddir --prefix=~/galahad -Dpythoniface=true
     else
-      FC=gfortran-12 CC=gcc-12 CXX=g++-12 meson setup builddir --prefix=~/galahad
+      FC=gfortran-12 CC=gcc-12 CXX=g++-12 meson setup builddir --prefix=~/galahad -Dpythoniface=true
     fi
   build_script: |
     meson compile -C builddir

.github/workflows/standalone.yml

@@ -43,15 +43,12 @@ jobs:
           python-version: '3.11'
 
       - name: Install Meson and Ninja
-        run: pip install meson ninja
+        run: pip install meson ninja numpy
 
       - name: Set environment variables
         shell: bash
         run: |
           echo "GALAHAD=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-          echo "OMP_CANCELLATION=TRUE" >> $GITHUB_ENV
-          echo "OMP_NESTED=TRUE" >> $GITHUB_ENV
-          echo "OMP_PROC_BIND=TRUE" >> $GITHUB_ENV
 
       - name: Install GNU compilers
         if: matrix.compiler == 'gnu'
@@ -77,7 +74,7 @@ jobs:
       - name: Setup GALAHAD
         shell: bash
         run: |
-          meson setup builddir --prefix=$GITHUB_WORKSPACE/galahad
+          meson setup builddir --prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true
         env:
           CC: ${{ matrix.cc_cmd }}
           FC: ${{ matrix.fc_cmd }}

meson.build

@@ -3,7 +3,7 @@ project(
   'c', 'cpp', 'fortran',
   version: '5.0.0',
   license: 'BSD-3',
-  meson_version: '>= 0.61.0',
+  meson_version: '>= 0.63.0',
   default_options: [
     'buildtype=debug',
     'libdir=lib',
@@ -19,6 +19,7 @@ cxx = meson.get_compiler('cpp')
 fc = meson.get_compiler('fortran')
 fc_compiler = find_program(fc.cmd_array())
 fs = import('fs')
+py = import('python').find_installation()
 
 # Remove messages about deprecated Intel compilers
 if cc.get_id() == 'intel' or cc.get_id() == 'intel-cl'
@@ -149,11 +150,13 @@ libgalahad_c_src = []
 libgalahad_cpp_src = []
 libgalahad_cutest_src = []
 libgalahad_ampl_src = []
+libgalahad_python_src = []
 
 galahad_examples = []
 galahad_c_examples = []
 galahad_tests = []
 galahad_c_tests = []
+galahad_python_tests = []
 
 # Headers and Fortran modules
 libgalahad_include = [include_directories('include'),
@@ -337,6 +340,41 @@ if build_double
                               install : true)
 endif
 
+if build_pythoniface and build_ciface and build_double
+  incdir_numpy = run_command(py,
+    ['-c', 'import numpy; print(numpy.get_include())'],
+    check : true
+  ).stdout().strip()
+  libgalahad_include += [incdir_numpy]
+
+  py_src = []
+  foreach interface: libgalahad_python_src
+    file = interface[1]
+    py_src += file
+  endforeach
+
+  py.extension_module('galahad',
+                      sources : py_src,
+                      link_with : libgalahad_double,
+                      link_language : 'c',
+                      include_directories : libgalahad_include,
+                      subdir : 'galahad',
+                      install : true)
+
+  # foreach interface: libgalahad_python_src
+  #   name = interface[0]
+  #   file = interface[1]
+
+  #   py.extension_module(name,
+  #                       sources : file,
+  #                       link_with : libgalahad_double,
+  #                       link_language : 'c',
+  #                       include_directories : libgalahad_include,
+  #                       subdir : 'galahad',
+  #                       install : true)
+  # endforeach
+endif
+
 # Binaries
 foreach binary: galahad_binaries
   binname = binary[0]
@@ -394,9 +432,18 @@ if build_tests
       package = test[0]
       name = test[1] + '_' + precision
       file = test[2]
+
+      deps_tests = libgalahad_deps
+      if precision == 'single'
+        deps_tests += libgalahad_single_deps
+      endif
+      if precision == 'double'
+        deps_tests += libgalahad_double_deps
+      endif
+
       if not (name == 'croti_single')
         test(name,
-             executable(name, file, fortran_args : args_precision, link_with : libgalahad_precision, dependencies : libgalahad_deps,
+             executable(name, file, fortran_args : args_precision, link_with : libgalahad_precision, dependencies : deps_tests,
                                     link_language : 'fortran', include_directories: libgalahad_include , install : true,
                                     install_dir : fortran_tests_folder),
              suite : [package, precision, 'fortran'],
@@ -428,6 +475,24 @@ if build_tests and build_ciface
   endforeach
 endif
 
+# Python tests
+if build_tests and build_pythoniface and build_ciface and build_double
+
+  pypathdir = meson.current_build_dir()
+
+  foreach test: galahad_python_tests
+    package = test[0]
+    name = test[1]
+    file = test[2]
+    test(name,
+         py,
+         args : file,
+         suite : [package, 'Python'],
+         env : ['PYTHONPATH=' + pypathdir],
+         is_parallel : false)
+  endforeach
+endif
+
 # Fortran examples
 if build_examples and build_double
 

src/arc/meson.build

@@ -1,7 +1,13 @@
 libgalahad_src += files('arc.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/arc_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['arc', files('Python/arc_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usearc.F90', 'runarc_sif.F90')
 endif
@@ -12,6 +18,8 @@ galahad_tests += [['arc', 'arct', files('arct.F90')],
 galahad_c_tests += [['arc', 'arct_c', files('C/arct.c')],
                     ['arc', 'arctf_c', files('C/arctf.c')]]
 
+galahad_python_tests += [['arc', 'arc_py', files('Python/test_arc.py')]]
+
 galahad_examples += [['arcs', files('arcs.f90')],
                      ['arcs2', files('arcs2.f90')],
                      ['arcs3', files('arcs3.f90')],

src/bgo/meson.build

@@ -1,7 +1,13 @@
 libgalahad_src += files('bgo.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/bgo_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['bgo', files('Python/bgo_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usebgo.F90', 'runbgo_sif.F90')
 endif
@@ -12,6 +18,9 @@ galahad_tests += [['bgo', 'bgot', files('bgot.F90')],
 galahad_c_tests += [['bgo', 'bgot_c', files('C/bgot.c')],
                     ['bgo', 'bgotf_c', files('C/bgotf.c')]]
 
+galahad_python_tests += [['bgo', 'bgo_py', files('Python/test_bgo.py')],
+                         ['bgo', 'bgo_quadratic_py', files('Python/test_bgo_quadratic.py')]]
+
 galahad_examples += [['bgos', files('bgos.f90')],
                      ['bgos2', files('bgos2.f90')]]
 

src/blls/meson.build

@@ -1,7 +1,13 @@
 libgalahad_src += files('blls.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/blls_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['blls', files('Python/blls_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('useblls.F90', 'runblls_sif.F90')
 endif
@@ -12,6 +18,8 @@ galahad_tests += [['blls', 'bllst', files('bllst.F90')],
 galahad_c_tests += [['blls', 'bllst_c', files('C/bllst.c')],
                     ['blls', 'bllstf_c', files('C/bllstf.c')]]
 
+galahad_python_tests += [['blls', 'blls_py', files('Python/test_blls.py')]]
+
 galahad_examples += [['bllss', files('bllss.f90')],
                      ['bllss2', files('bllss2.f90')],
                      ['bllss3', files('bllss3.f90')]]

src/bqp/meson.build

@@ -1,8 +1,15 @@
 libgalahad_src += files('bqp.F90')
+
 galahad_binaries += [['inbqp', files('inbqp.F90')]]
+
 if build_ciface
   libgalahad_c_src += files('C/bqp_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['bqp', files('Python/bqp_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usebqp.F90', 'runbqp_sif.F90')
 endif
@@ -13,6 +20,8 @@ galahad_tests += [['bqp', 'bqpt', files('bqpt.F90')],
 galahad_c_tests += [['bqp', 'bqpt_c', files('C/bqpt.c')],
                     ['bqp', 'bqptf_c', files('C/bqptf.c')]]
 
+galahad_python_tests += [['bqp', 'bqp_py', files('Python/test_bqp.py')]]
+
 galahad_examples += [['bqps', files('bqps.f90')],
                      ['bqps2', files('bqps2.f90')],
                      ['bqps3', files('bqps3.f90')]]

src/bqpb/meson.build

@@ -1,8 +1,15 @@
 libgalahad_src += files('bqpb.F90')
+
 galahad_binaries += [['inbqpb', files('inbqpb.F90')]]
+
 if build_ciface
   libgalahad_c_src += files('C/bqpb_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['bqpb', files('Python/bqpb_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usebqpb.F90', 'runbqpb_sif.F90')
 endif
@@ -13,5 +20,7 @@ galahad_tests += [['bqpb', 'bqpbt', files('bqpbt.F90')],
 galahad_c_tests += [['bqpb', 'bqpbt_c', files('C/bqpbt.c')],
                     ['bqpb', 'bqpbtf_c', files('C/bqpbtf.c')]]
 
+galahad_python_tests += [['bqpb', 'bqpb_py', files('Python/test_bqpb.py')]]
+
 galahad_examples += [['bqpbs', files('bqpbs.f90')],
                      ['bqpbs2', files('bqpbs2.f90')]]

src/bsc/meson.build

@@ -1,8 +1,15 @@
 libgalahad_src += files('bsc.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/bsc_ciface.F90')
 endif
 
+if build_pythoniface
+  libgalahad_python_src += [['bsc', files('Python/bsc_pyiface.c')]]
+endif
+
 galahad_tests += [['bsc', 'bsct', files('bsct.F90')]]
 
+galahad_python_tests += [['bsc', 'bsc_py', files('Python/test_bsc.py')]]
+
 galahad_examples += [['bscs', files('bscs.f90')]]

src/convert/meson.build

@@ -1,8 +1,15 @@
 libgalahad_src += files('convert.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/convert_ciface.F90')
 endif
 
+if build_pythoniface
+  libgalahad_python_src += [['convert', files('Python/convert_pyiface.c')]]
+endif
+
 galahad_tests += [['convert', 'convertt', files('convertt.F90')]]
 
+galahad_python_tests += [['convert', 'convert_py', files('Python/test_convert.py')]]
+
 galahad_examples += [['converts', files('converts.f90')]]

src/cqp/meson.build

@@ -1,8 +1,15 @@
 libgalahad_src += files('cqp.F90')
+
 galahad_binaries += [['incqp', files('incqp.F90')]]
+
 if build_ciface
   libgalahad_c_src += files('C/cqp_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['cqp', files('Python/cqp_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usecqp.F90', 'runcqp_sif.F90')
 endif
@@ -13,6 +20,8 @@ galahad_tests += [['cqp', 'cqpt', files('cqpt.F90')],
 galahad_c_tests += [['cqp', 'cqpt_c', files('C/cqpt.c')],
                     ['cqp', 'cqptf_c', files('C/cqptf.c')]]
 
+galahad_python_tests += [['cqp', 'cqp_py', files('Python/test_cqp.py')]]
+
 galahad_examples += [['cqps', files('cqps.f90')],
                      ['cqps2', files('cqps2.f90')],
                      ['cqps3', files('cqps3.f90')]]

src/cro/meson.build

@@ -4,12 +4,18 @@ if build_ciface
   libgalahad_c_src += files('C/cro_ciface.F90')
 endif
 
+if build_pythoniface
+  libgalahad_python_src += [['cro', files('Python/cro_pyiface.c')]]
+endif
+
 galahad_tests += [['cro', 'crot', files('crot.F90')],
                   ['cro', 'croti', files('croti.F90')]]
 
 galahad_c_tests += [['cro', 'crot_c', files('C/crot.c')],
                     ['cro', 'crotf_c', files('C/crotf.c')]]
 
+galahad_python_tests += [['cro', 'cro_py', files('Python/test_cro.py')]]
+
 galahad_examples += [['cros', files('cros.f90')],
                      ['cros2', files('cros2.f90')],
                      ['cros3', files('cros3.f90')]]

src/dgo/meson.build

@@ -1,7 +1,13 @@
 libgalahad_src += files('dgo.F90')
+
 if build_ciface
   libgalahad_c_src += files('C/dgo_ciface.F90')
 endif
+
+if build_pythoniface
+  libgalahad_python_src += [['dgo', files('Python/dgo_pyiface.c')]]
+endif
+
 if libcutest.found()
   libgalahad_cutest_src += files('usedgo.F90', 'rundgo_sif.F90')
 endif
@@ -12,6 +18,9 @@ galahad_tests += [['dgo', 'dgot', files('dgot.F90')],
 galahad_c_tests += [['dgo', 'dgot_c', files('C/dgot.c')],
                     ['dgo', 'dgotf_c', files('C/dgotf.c')]]
 
+galahad_python_tests += [['dgo', 'dgo_py', files('Python/test_dgo.py')],
+                         ['dgo', 'dgo_quadratic_py', files('Python/test_dgo_quadratic.py')]]
+
 galahad_examples += [['dgos', files('dgos.f90')],
                      ['dgos2', files('dgos2.f90')]]