Skip to content

Commit ffd5c98

Browse files
Distributed.jl -> Multicluster.jl
1 parent 2a8df42 commit ffd5c98

File tree

14 files changed

+114
-233
lines changed

14 files changed

+114
-233
lines changed

Project.toml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
name = "Distributed"
2-
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1+
name = "Multicluster"
2+
uuid = "236308dc-ae00-46af-a4e9-4f62f68ef0a5"
33
version = "1.11.0"
44

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

10-
[extras]
11-
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
12-
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
13-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
14-
15-
[targets]
16-
test = ["Aqua", "LinearAlgebra", "Test"]
17-
1811
[compat]
1912
Aqua = "0.8.10"
2013
LinearAlgebra = "1"
14+
MPIClusterManagers = "0.2.4"
2115
Random = "1"
2216
Serialization = "1"
2317
Sockets = "1"
2418
Test = "1"
2519
julia = "1"
20+
21+
[extras]
22+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
23+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
24+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
25+
26+
[targets]
27+
test = ["Aqua", "LinearAlgebra", "Test"]

docs/make.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
using Distributed
1+
using Multicluster
22
using Documenter: DocMeta, makedocs, deploydocs
33

4-
DocMeta.setdocmeta!(Distributed, :DocTestSetup, :(using Distributed); recursive=true)
4+
DocMeta.setdocmeta!(Multicluster, :DocTestSetup, :(using Multicluster); recursive=true)
55

66
makedocs(;
7-
modules = [Distributed],
8-
sitename = "Distributed",
7+
modules = [Multicluster],
8+
sitename = "Multicluster",
99
pages = Any[
10-
"Distributed" => "index.md",
10+
"Multicluster" => "index.md",
1111
],
1212
checkdocs = :exports,
1313
warnonly = [:cross_references],
1414
)
1515

16-
deploydocs(repo = "github.com/JuliaLang/Distributed.jl.git")
16+
deploydocs(repo = "github.com/JuliaLang/Multicluster.jl.git")

src/Distributed.jl

Lines changed: 0 additions & 121 deletions
This file was deleted.

src/macros.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ julia> fetch(f)
4646
function check_args_2(args...)
4747
na = length(args)
4848
if na==1
49-
role = :(role = :default)
49+
role = Expr(:kw, :role, :(:defaut)) #:(role = :default)
5050
expr = args[1]
5151
elseif na==2
5252
role = args[1]
@@ -107,7 +107,7 @@ julia> fetch(f)
107107
function check_args_3a(args...)
108108
na = length(args)
109109
if na==2
110-
role = :(role = :default)
110+
role = Expr(:kw, :role, :(:defaut)) #:(role = :default)
111111
p = args[1]
112112
expr = args[2]
113113
elseif na==3
@@ -247,7 +247,7 @@ function check_args_3b(args...)
247247

248248
na = length(args)
249249
if na==1
250-
rolearg = :(role = :default)
250+
rolearg = Expr(:kw, :role, :(:defaut)) #:(role = :default)
251251
reducer = nothing
252252
loop = args[1]
253253
elseif na==2
@@ -256,7 +256,7 @@ function check_args_3b(args...)
256256
reducer = nothing
257257
loop = args[2]
258258
else
259-
rolearg = :(role = :default)
259+
rolearg = Expr(:kw, :role, :(:defaut)) #:(role = :default)
260260
reducer = args[1]
261261
loop = args[2]
262262
end
@@ -277,7 +277,7 @@ macro everywhere(args...)
277277

278278
if isnothing(procs)
279279
procs = GlobalRef(@__MODULE__, :procs)
280-
return esc(:($(Distributed).@everywhere $rolearg $procs(;$rolearg) $ex))
280+
return esc(:($(Multicluster).@everywhere $rolearg $procs(;$rolearg) $ex))
281281
else
282282
imps = extract_imports(ex)
283283
return quote

src/managers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ function launch(manager::LocalManager, params::Dict, launched::Array, c::Conditi
494494

495495
# TODO: Maybe this belongs in base/initdefs.jl as a package_environment() function
496496
# together with load_path() etc. Might be useful to have when spawning julia
497-
# processes outside of Distributed.jl too.
497+
# processes outside of Multicluster.jl too.
498498
# JULIA_(LOAD|DEPOT)_PATH are used to populate (LOAD|DEPOT)_PATH on startup,
499499
# but since (LOAD|DEPOT)_PATH might have changed they are re-serialized here.
500500
# Users can opt-out of this by passing `env = ...` to addprocs(...).

src/pmap.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Return `head`: the first `n` elements of `c`;
240240
and `tail`: an iterator over the remaining elements.
241241
242242
```jldoctest
243-
julia> b, c = Distributed.head_and_tail(1:10, 3)
243+
julia> b, c = Multicluster.head_and_tail(1:10, 3)
244244
([1, 2, 3], Base.Iterators.Rest{UnitRange{Int64}, Int64}(1:10, 3))
245245
246246
julia> collect(c)

src/precompile.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
precompile(Tuple{typeof(Distributed.remotecall),Function,Int,Module,Vararg{Any, 100}})
2-
precompile(Tuple{typeof(Distributed.procs)})
3-
precompile(Tuple{typeof(Distributed.finalize_ref), Distributed.Future})
1+
precompile(Tuple{typeof(Multicluster.remotecall),Function,Int,Module,Vararg{Any, 100}})
2+
precompile(Tuple{typeof(Multicluster.procs)})
3+
precompile(Tuple{typeof(Multicluster.finalize_ref), Multicluster.Future})
44
# This is disabled because it doesn't give much benefit
5-
# and the code in Distributed is poorly typed causing many invalidations
6-
# TODO: Maybe reenable now that Distributed is not in sysimage.
5+
# and the code in Multicluster is poorly typed causing many invalidations
6+
# TODO: Maybe reenable now that Multicluster is not in sysimage.
77
#=
88
precompile_script *= """
9-
using Distributed
9+
using Multicluster
1010
addprocs(2)
1111
pmap(x->iseven(x) ? 1 : 0, 1:4)
1212
@distributed (+) for i = 1:100 Int(rand(Bool)) end

test/aqua.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Aqua
2-
using Distributed
2+
using Multicluster
33
Aqua.test_all(
4-
Distributed,
4+
Multicluster,
55
# This should be excluded, but it's not clear how to do that on Aqua's API
66
# given it's not-defined. (The Julia Base ambiguity test does it something like this)
7-
# ambiguities=(exclude=[GlobalRef(Distributed, :cluster_manager)])
7+
# ambiguities=(exclude=[GlobalRef(Multicluster, :cluster_manager)])
88
)

0 commit comments

Comments
 (0)