Skip to content

Commit fc8270a

Browse files
...
1 parent 71d6de2 commit fc8270a

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ uuid = "236308dc-ae00-46af-a4e9-4f62f68ef0a5"
33
version = "1.11.0"
44

55
[deps]
6+
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
67
MPIClusterManagers = "e7922434-ae4b-11e9-05c5-9780451d2c66"
78
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
89
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
910
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
1011

1112
[compat]
1213
Aqua = "0.8.10"
14+
Distributed = "1.11.0"
1315
LinearAlgebra = "1"
1416
MPIClusterManagers = "0.2.4"
1517
Random = "1"

src/Multicluster.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import Serialization: serialize, deserialize
2323
import Sockets: connect, wait_connected
2424

2525
using MPIClusterManagers
26+
using Distributed
2627

2728
# NOTE: clusterserialize.jl imports additional symbols from Serialization for use
2829

src/multicluster_exts.jl

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ struct Node
2020
pid::Integer
2121
function Node(cid, pid)
2222
@assert haskey(cluster_table[], cid)
23-
@assert(@fetchfrom(cid, in(pid, workers(role=:master))))
23+
#@assert(@fetchfrom(cid, in(pid, workers(role=:master))))
24+
try
25+
b = remotecall_fetch(w -> in(w, Distributed.workers(role=:master)), cid, pid)
26+
@assert b
27+
catch e
28+
@info e
29+
end
2430
new(cid, pid)
2531
end
2632
end
@@ -38,6 +44,7 @@ function addcluster(access_node, nw; kwargs...)
3844
master_id = addprocs([access_node]; access_node_args...)
3945

4046
@everywhere master_id @eval using MPIClusterManagers
47+
@everywhere master_id @eval using Distributed
4148

4249
@info "master_id = $master_id"
4350

@@ -46,15 +53,15 @@ function addcluster(access_node, nw; kwargs...)
4653
@info "compute_node_args = $compute_node_args"
4754

4855
wpids = if MPI
49-
remotecall_fetch(addprocs, master_id[1], MPIWorkerManager(nw); compute_node_args...)
56+
remotecall_fetch(Distributed.addprocs, master_id[1], MPIWorkerManager(nw); compute_node_args...)
5057
else
5158
# TODO
5259
throw("not implemented")
5360
end
5461

55-
@info "pids = $wpids"
62+
@info "pids ? $wpids"
5663

57-
cluster_table[][master_id] = ClusterInfo(master_id[1], access_node, nw, access_node_args, compute_node_args, [wpids])
64+
cluster_table[][master_id[1]] = ClusterInfo(master_id[1], access_node, nw, access_node_args, compute_node_args, wpids)
5865

5966
return Cluster(master_id[1])
6067
end

0 commit comments

Comments
 (0)