Merge branch 'master' of github.com:JuliaLang/julia

Author: JeffBezanson

base/basedocs.jl

@@ -264,3 +264,16 @@ keywords[:...] = doc"""
   `FFTW.set_num_threads(np)` to use `np` threads, if you have `np`
   processors.
   """ fft
+
+@doc doc"""
+      include("file.jl")
+
+  Evaluate the contents of a source file in the current context.
+  During including, a task-local include path is set to the directory
+  containing the file. Nested calls to `include` will search
+  relative to that path. All paths refer to files on node 1 when
+  running in parallel, and files will be fetched from node 1. This
+  function is typically used to load source interactively, or to
+  combine files in packages that are broken into multiple source
+  files.
+  """ include_from_node1

base/darray.jl

@@ -310,6 +310,9 @@ reduce(f::Function, d::DArray) =
     mapreduce(fetch, f,
               Any[ @spawnat p reduce(f, localpart(d)) for p in procs(d) ])
 
+mapreduce(f :: Function, opt :: Function, d :: DArray) =
+    mapreduce(fetch, opt,
+              Any[ @spawnat p mapreduce(f, opt, localpart(d)) for p in procs(d) ])
 
 function map!(f::Callable, d::DArray)
     @sync begin