Merge pull request #198 from tbole/add_functions

Add wrappers for MPI_Info related routines, MPI_COMM_SPLIT and timers

Author: andreasnoack

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_constants.f90

@@ -28,6 +28,8 @@ program gen_constants
   call output("MPI_COMM_SELF   ", MPI_COMM_SELF)
   call output("MPI_COMM_WORLD  ", MPI_COMM_WORLD)
 
+  call output("MPI_COMM_TYPE_SHARED", MPI_COMM_TYPE_SHARED)
+
   call output("MPI_OP_NULL     ", MPI_OP_NULL)
   call output("MPI_BAND        ", MPI_BAND)
   call output("MPI_BOR         ", MPI_BOR)
@@ -45,6 +47,8 @@ program gen_constants
 
   call output("MPI_REQUEST_NULL", MPI_REQUEST_NULL)
 
+  call output("MPI_INFO_NULL   ", MPI_INFO_NULL)
+
   call output("MPI_STATUS_SIZE ", MPI_STATUS_SIZE)
   call output("MPI_ERROR       ", MPI_ERROR)
   call output("MPI_SOURCE      ", MPI_SOURCE)

deps/gen_functions.c

@@ -32,6 +32,7 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_COMM_RANK          => \"%s\",\n", STRING(MPI_COMM_RANK));
   printf("    :MPI_COMM_SIZE          => \"%s\",\n", STRING(MPI_COMM_SIZE));
   printf("    :MPI_COMM_SPLIT         => \"%s\",\n", STRING(MPI_COMM_SPLIT));
+  printf("    :MPI_COMM_SPLIT_TYPE    => \"%s\",\n", STRING(MPI_COMM_SPLIT_TYPE));
   printf("    :MPI_EXSCAN             => \"%s\",\n", STRING(MPI_EXSCAN));
   printf("    :MPI_FINALIZE           => \"%s\",\n", STRING(MPI_FINALIZE));
   printf("    :MPI_FINALIZED          => \"%s\",\n", STRING(MPI_FINALIZED));
@@ -40,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));
@@ -70,14 +77,15 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_WAITALL            => \"%s\",\n", STRING(MPI_WAITALL));
   printf("    :MPI_WAITANY            => \"%s\",\n", STRING(MPI_WAITANY));
   printf("    :MPI_WAITSOME           => \"%s\",\n", STRING(MPI_WAITSOME));
+  printf("    :MPI_WTICK              => \"%s\",\n", STRING(MPI_WTICK));
   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));
+  printf("primitive type CComm %d end\n", (int)(sizeof(MPI_Comm) * 8));
 
   return 0;
 }

src/mpi-base.jl

@@ -93,6 +93,54 @@ mutable struct Request
 end
 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
+
+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}
     Status() = new(Array{Cint}(MPI_STATUS_SIZE))
@@ -169,6 +217,30 @@ function Comm_size(comm::Comm)
     Int(size[])
 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}),
+          &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}),
+          &comm.val, &split_type, &key, &info.val, newcomm, &0)
+    MPI.Comm(newcomm[])
+end
+
+function Wtick()
+    ccall(MPI_WTICK, Cdouble, () )
+end
+
+function Wtime()
+    ccall(MPI_WTIME, Cdouble, () )
+end
+
 function type_create(T::DataType)
     if !isbits(T)
         throw(ArgumentError("Type must be isbits()"))

src/mpi-op.jl

@@ -51,11 +51,11 @@ function user_op(opfunc::Function)
     return _user_op
 end
 
-# use function types in Julia 0.5 to automatically use built-in
+# use function types in Julia 0.7 to automatically use built-in
 # MPI operations for the corresponding Julia functions.
 for (f,op) in ((+,SUM), (*,PROD),
                (min,MIN), (max,MAX),
-               (&, BAND), (|, BOR), ($, BXOR))
+               (&, BAND), (|, BOR), (⊻, BXOR))
     @eval user_op(::$(typeof(f))) = $op
 end
 

src/win_mpiconstants.jl

@@ -22,6 +22,7 @@ const MPI_INTEGER8 = Int32(0x4c000831)
 const MPI_COMM_NULL = Int32(67108864)
 const MPI_COMM_SELF = Int32(1140850689)
 const MPI_COMM_WORLD = Int32(1140850688)
+const MPI_COMM_TYPE_SHARED = Int32(1)
 const MPI_OP_NULL = Int32(402653184)
 const MPI_BAND = Int32(1476395014)
 const MPI_BOR = Int32(1476395016)
@@ -37,6 +38,7 @@ const MPI_PROD = Int32(1476395012)
 const MPI_REPLACE = Int32(1476395021)
 const MPI_SUM = Int32(1476395011)
 const MPI_REQUEST_NULL = Int32(738197504)
+const MPI_INFO_NULL = Int32(469762048)
 const MPI_STATUS_SIZE = Int32(5)
 const MPI_ERROR = Int32(5)
 const MPI_SOURCE = Int32(3)
@@ -51,6 +53,8 @@ const MPI_ABORT = (:MPI_ABORT, "msmpi.dll")
 const MPI_INIT = (:MPI_INIT, "msmpi.dll")
 const MPI_COMM_RANK = (:MPI_COMM_RANK, "msmpi.dll")
 const MPI_COMM_SIZE = (:MPI_COMM_SIZE, "msmpi.dll")
+const MPI_COMM_SPLIT = (:MPI_COMM_SPLIT, "msmpi.dll")
+const MPI_COMM_SPLIT_TYPE = (:MPI_COMM_SPLIT_TYPE, "msmpi.dll")
 const MPI_BARRIER = (:MPI_BARRIER, "msmpi.dll")
 const MPI_FINALIZE = (:MPI_FINALIZE, "msmpi.dll")
 const MPI_BCAST = (:MPI_BCAST, "msmpi.dll")

test/runtests.jl

@@ -3,6 +3,7 @@ using Base.Test
 
 using Compat
 import Compat.String
+import Compat.Sys: BINDIR
 
 # Code coverage command line options; must correspond to src/julia.h
 # and src/ui/repl.c
@@ -21,7 +22,7 @@ singlefiles = []
 
 function runtests()
     nprocs = clamp(Sys.CPU_CORES, 2, 4)
-    exename = joinpath(JULIA_HOME, Base.julia_exename())
+    exename = joinpath(BINDIR, Base.julia_exename())
     testdir = dirname(@__FILE__)
     istest(f) = endswith(f, ".jl") && startswith(f, "test_")
     testfiles = sort(filter(istest, readdir(testdir)))

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()