process ids are independent of nprocs()

JuliaLang · Jun 15, 2013 · 68256c1 · 68256c1
1 parent 36cd5e6
commit 68256c1
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 97 deletions.
diff --git a/base/client.jl b/base/client.jl
@@ -281,11 +281,10 @@ function init_head_sched()
     # start in "head node" mode
     global const Scheduler = Task(()->event_loop(true), 1024*1024)
     global PGRP
-    PGRP.myid = 1
-    assert(PGRP.np == 0)
-    push!(PGRP.workers,LocalProcess())
-    push!(PGRP.locs,("",0))
-    PGRP.np = 1
+    global LPROC
+    LPROC.id = 1
+    assert(length(PGRP.workers) == 0)
+    register_worker(LPROC)
     # make scheduler aware of current (root) task
     unshift!(Workqueue, roottask)
     yield()

diff --git a/base/darray.jl b/base/darray.jl
@@ -45,7 +45,7 @@ function DArray(init, dims, procs)
     end
     DArray(init, dims, procs, defaultdist(dims,procs))
 end
-DArray(init, dims) = DArray(init, dims, [1:min(nprocs(),max(dims))])
+DArray(init, dims) = DArray(init, dims, list_allprocs()[1:min(nprocs(),max(dims))])
 
 size(d::DArray) = d.dims
 procs(d::DArray) = d.pmap

diff --git a/base/exports.jl b/base/exports.jl
@@ -1085,6 +1085,10 @@ export
     yield,
     myid,
     nprocs,
+    nworkers,
+    list_allprocs,
+    list_workers,
+    rmprocs,
     pmap,
     put,
     remotecall,

diff --git a/base/loading.jl b/base/loading.jl
@@ -37,7 +37,7 @@ require(f::String, fs::String...) = (require(f); for x in fs require(x); end)
 
 function require(name::ByteString)
     if myid() == 1
-        @sync for p = 2:nprocs()
+        @sync for p in list_workers()
             @spawnat p require(name)
         end
     end
@@ -52,7 +52,7 @@ end
 
 function reload(name::String)
     if myid() == 1
-        @sync for p = 2:nprocs()
+        @sync for p in list_workers()
             @spawnat p reload(name)
         end
     end