Add wrappers for MPI_Info related routines.

Author: tbole

deps/CMakeLists.txt

@@ -41,6 +41,7 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_COMM_RANK
   MPI_COMM_SIZE
   MPI_COMM_SPLIT
+  MPI_COMM_SPLIT_TYPE
   MPI_EXSCAN
   MPI_FINALIZE
   MPI_FINALIZED
@@ -49,6 +50,12 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_GATHERV
   MPI_GET_COUNT
   MPI_GET_PROCESSOR_NAME
+  MPI_INFO_CREATE
+  MPI_INFO_DELETE
+  MPI_INFO_FREE
+  MPI_INFO_GET
+  MPI_INFO_GET_VALUELEN
+  MPI_INFO_SET
   MPI_INIT
   MPI_INITIALIZED
   MPI_IPROBE
@@ -81,6 +88,7 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_WAITALL
   MPI_WAITANY
   MPI_WAITSOME
+  MPI_WTICK
   MPI_WTIME
 )
 

deps/gen_functions.c

@@ -41,6 +41,12 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_GET_COUNT          => \"%s\",\n", STRING(MPI_GET_COUNT));
   printf("    :MPI_GET_PROCESSOR_NAME => \"%s\",\n",
          STRING(MPI_GET_PROCESSOR_NAME));
+  printf("    :MPI_INFO_CREATE        => \"%s\",\n", STRING(MPI_INFO_CREATE));
+  printf("    :MPI_INFO_DELETE        => \"%s\",\n", STRING(MPI_INFO_DELETE));
+  printf("    :MPI_INFO_FREE          => \"%s\",\n", STRING(MPI_INFO_FREE));
+  printf("    :MPI_INFO_GET           => \"%s\",\n", STRING(MPI_INFO_GET));
+  printf("    :MPI_INFO_GET_VALUELEN  => \"%s\",\n", STRING(MPI_INFO_GET_VALUELEN));
+  printf("    :MPI_INFO_SET           => \"%s\",\n", STRING(MPI_INFO_SET));
   printf("    :MPI_INIT               => \"%s\",\n", STRING(MPI_INIT));
   printf("    :MPI_INITIALIZED        => \"%s\",\n", STRING(MPI_INITIALIZED));
   printf("    :MPI_IPROBE             => \"%s\",\n", STRING(MPI_IPROBE));

src/mpi-base.jl

@@ -95,8 +95,51 @@ const REQUEST_NULL = Request(MPI_REQUEST_NULL, nothing)
 
 mutable struct Info
     val::Cint
+    #val::Cint
+    function Info()
+        newinfo = Ref{Cint}()
+        ccall(MPI_INFO_CREATE, Void, (Ptr{Cint}, Ptr{Cint}), newinfo, &0 )
+        info=new(newinfo[])
+        finalizer(info, info -> ( ccall(MPI_INFO_FREE, Void,
+                                       (Ptr{Cint}, Ptr{Cint}), &info.val, &0);
+                                  info.val = MPI_INFO_NULL ) )
+        info
+    end
+end
+const INFO_NULL = MPI_INFO_NULL
+
+# the info functions assume that Fortran hidden arguments are placed at the end of the argument list
+function Info_set(info::Info,key::AbstractString,value::AbstractString)
+    @assert isascii(key) && isascii(value)
+    ccall(MPI_INFO_SET, Void,
+          (Ptr{Cint}, Ptr{UInt8}, Ptr{UInt8}, Ptr{Cint}, Csize_t, Csize_t),
+           &info.val, key, value, &0, sizeof(key), sizeof(value))
+end
+
+function Info_get(info::Info,key::AbstractString)
+    @assert isascii(key)
+    keyexists=Ref{Bool}()
+    len=Ref{Cint}()
+    ccall(MPI_INFO_GET_VALUELEN, Void,
+          (Ptr{Cint}, Ptr{UInt8}, Ptr{Cint}, Ptr{Bool}, Ptr{Cint}, Csize_t),
+           &info.val, key, len, keyexists, &0, sizeof(key))
+    if keyexists[]
+        value=" "^(len[])
+        ccall(MPI_INFO_GET, Void,
+              (Ptr{Cint}, Ptr{UInt8}, Ptr{Cint}, Ptr{UInt8}, Ptr{Bool}, Ptr{Cint}, Csize_t, Csize_t),
+               &info.val, key, len, value, keyexists, &0, sizeof(key), sizeof(value) )
+    else
+        value=""
+    end
+    value
 end
-const INFO_NULL = Info(MPI_INFO_NULL)
+
+function Info_delete(info::Info,key::AbstractString)
+    @assert isascii(key)
+    ccall(MPI_INFO_DELETE, Void,
+          (Ptr{Cint}, Ptr{UInt8}, Ptr{Cint}, Csize_t), &info.val, key ,&0, sizeof(key) )
+end
+Info_free(info::Info) = finalize(info)
 
 mutable struct Status
     val::Array{Cint,1}
@@ -176,14 +219,16 @@ end
 
 function Comm_split(comm::Comm,color::Integer,key::Integer)
     newcomm = Ref{Cint}()
-    ccall(MPI_COMM_SPLIT, Void, (Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
+    ccall(MPI_COMM_SPLIT, Void,
+          (Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
           &comm.val, &color, &key, newcomm, &0)
     MPI.Comm(newcomm[])
 end
 
 function Comm_split_type(comm::Comm,split_type::Integer,key::Integer;info::Info=INFO_NULL)
     newcomm = Ref{Cint}()
-    ccall(MPI_COMM_SPLIT_TYPE, Void, (Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
+    ccall(MPI_COMM_SPLIT_TYPE, Void,
+          (Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
           &comm.val, &split_type, &key, &info.val, newcomm, &0)
     MPI.Comm(newcomm[])
 end

test/test_info.jl

@@ -0,0 +1,17 @@
+using Base.Test
+using MPI
+
+MPI.Init()
+
+info = MPI.Info()
+@test typeof(info) == MPI.Info
+@test info.val != MPI.Info
+MPI.Info_set(info, "foo", "fast")
+MPI.Info_set(info, "bar", "evenfaster")
+@test MPI.Info_get(info, "foo" ) == "fast"
+MPI.Info_delete(info, "bar")
+@test MPI.Info_get(info, "bar" ) == ""
+finalize(info)
+@test info.val == MPI.INFO_NULL
+
+MPI.Finalize()