Merge pull request #124 from JaredCrean2/datatypes

Support creating datatypes for Julia bitstypes.

Author: eschnett

deps/CMakeLists.txt

@@ -74,6 +74,8 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_TESTALL
   MPI_TESTANY
   MPI_TESTSOME
+  MPI_TYPE_COMMIT
+  MPI_TYPE_CREATE_STRUCT
   MPI_UNPACK
   MPI_WAIT
   MPI_WAITALL

deps/gen_functions.c

@@ -1,8 +1,12 @@
 #include <stdio.h>
+#include <stddef.h>
 #include "jlmpi_f2c.h"
 #include "mpi.h"
 #include "version.h"
 
+// check that the size of MPI_Aint is consistent
+typedef int check_sizeof_MPI_Aint[sizeof(MPI_Aint) == sizeof(ptrdiff_t) ? 1 : -1];
+
 #define STRING1(s) #s
 #define STRING(s) STRING1(s)
 
@@ -64,6 +68,10 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_WAITANY            => \"%s\",\n", STRING(MPI_WAITANY));
   printf("    :MPI_WAITSOME           => \"%s\",\n", STRING(MPI_WAITSOME));
   printf("    :MPI_WTIME              => \"%s\",\n", STRING(MPI_WTIME));
+  printf("    :MPI_TYPE_CREATE_STRUCT => \"%s\",\n", 
+         STRING(MPI_TYPE_CREATE_STRUCT));
+  printf("    :MPI_TYPE_COMMIT        => \"%s\",\n", 
+         STRING(MPI_TYPE_COMMIT));
   printf(")\n");
   printf("\n");
   printf("bitstype %d CComm\n", (int)(sizeof(MPI_Comm) * 8));

src/MPI.jl

@@ -30,6 +30,34 @@ function __init__()
             eval(:(const $jname = Libdl.dlsym(libmpi_handle, $fname)))
         end
     end
+
+    global const mpitype_dict = Dict{DataType, Cint}(
+        # Older versions of OpenMPI (such as those used by default in
+        # Travis) do not define MPI_WCHAR and the MPI_*INT*_T types for
+        # Fortran. We thus don't require them (yet).
+        # Char => MPI_WCHAR,
+        # Int8 => MPI_INT8_T,
+        # UInt8 => MPI_UINT8_T,
+        # Int16 => MPI_INT16_T,
+        # UInt16 => MPI_UINT16_T,
+        # Int32 => MPI_INT32_T,
+        # UInt32 => MPI_UINT32_T,
+        # Int64 => MPI_INT64_T,
+        # UInt64 => MPI_UINT64_T,
+        Char => MPI_INTEGER4,
+        Int8 => MPI_INTEGER1,
+        UInt8 => MPI_INTEGER1,
+        Int16 => MPI_INTEGER2,
+        UInt16 => MPI_INTEGER2,
+        Int32 => MPI_INTEGER4,
+        UInt32 => MPI_INTEGER4,
+        Int64 => MPI_INTEGER8,
+        UInt64 => MPI_INTEGER8,
+        Float32 => MPI_REAL4,
+        Float64 => MPI_REAL8,
+        Complex64 => MPI_COMPLEX8,
+        Complex128 => MPI_COMPLEX16)
+
 end
 
 end