Merge pull request #251 from sourceryinstitute/issue-204-expose-init-finalize

Expose caf_init and caf_finalize in module to allow use with f2py

Fixes #204

Author: zbeekman

src/extensions/opencoarrays.F90

@@ -51,6 +51,10 @@ module opencoarrays
     integer(atomic_int_kind), allocatable :: atom[:]
   end type
 #endif
+#ifdef EXPOSE_INIT_FINALIZE
+  public :: caf_init
+  public :: caf_finalize
+#endif
 
   ! Generic interface to co_broadcast with implementations for various types, kinds, and ranks
   interface co_reduce
@@ -196,6 +200,29 @@ pure function logical_operator(lhs,rhs) result(lhs_op_rhs)
   ! Bindings for OpenCoarrays C procedures
   interface
 
+    ! C function signature from ../mpi/mpi_caf.c:
+    ! void
+    ! PREFIX (init) (int *argc, char ***argv)
+#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
+    subroutine caf_init(argc,argv) bind(C,name="_caf_extensions_init")
+#else
+    subroutine caf_init(argc,argv) bind(C,name="_gfortran_caf_init")
+#endif
+      import :: c_int,c_ptr
+      type(c_ptr), value :: argc
+      type(c_ptr), value :: argv
+    end subroutine
+
+    ! C function signature from ../mpi/mpi_caf.c:
+    ! void
+    ! PREFIX (finalize) (void)
+#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
+    subroutine caf_finalize() bind(C,name="_caf_extensions_finalize")
+#else
+    subroutine caf_finalize() bind(C,name="_gfortran_caf_finalize")
+#endif
+    end subroutine
+
     ! C function signature from ../mpi/mpi_caf.c:
     ! void
     ! PREFIX (co_min) (gfc_descriptor_t *a, int result_image, int *stat, char *errmsg,

src/mpi/CMakeLists.txt

@@ -15,6 +15,11 @@ if(gfortran_compiler AND (NOT opencoarrays_aware_compiler))
   add_definitions(-DCOMPILER_SUPPORTS_CAF_INTRINSICS)
 endif()
 
+option(CAF_EXPOSE_INIT_FINALIZE "Expose caf_init and caf_finalize in opencoarrays module" FALSE)
+if(CAF_EXPOSE_INIT_FINALIZE)
+  add_definitions(-DEXPOSE_INIT_FINALIZE)
+endif()
+
 add_library(caf_mpi mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)
 
 set_target_properties ( caf_mpi