diff --git a/src/SlurmClusterManager.jl b/src/SlurmClusterManager.jl index 11eadc7..5c4963d 100644 --- a/src/SlurmClusterManager.jl +++ b/src/SlurmClusterManager.jl @@ -1,9 +1,22 @@ module SlurmClusterManager -export SlurmManager, launch, manage +# We don't do `using Foo`. +# We either do `using Foo: hello, world`, or we do `import Foo`. +# https://github.com/JuliaLang/julia/pull/42080 -using Distributed -import Distributed: launch, manage +import Distributed + +# Bring these names into scope because we are going to re-export them: +using Distributed: launch, manage + +# We re-export Distributed.launch and Distributed.manage: +export launch, manage + +# We also export SlurmManager: +export SlurmManager + +# Bring some other names into scope, just for convenience: +using Distributed: ClusterManager, WorkerConfig, cluster_cookie include("slurmmanager.jl") diff --git a/src/slurmmanager.jl b/src/slurmmanager.jl index 91e43ae..c5b4ea5 100644 --- a/src/slurmmanager.jl +++ b/src/slurmmanager.jl @@ -82,7 +82,7 @@ function _new_environment_additions(params_env::Dict{String, String}) return env2 end -function launch(manager::SlurmManager, params::Dict, instances_arr::Array, c::Condition) +function Distributed.launch(manager::SlurmManager, params::Dict, instances_arr::Array, c::Condition) try exehome = params[:dir] exename = params[:exename] @@ -157,6 +157,6 @@ function launch(manager::SlurmManager, params::Dict, instances_arr::Array, c::Co end end -function manage(manager::SlurmManager, id::Integer, config::WorkerConfig, op::Symbol) +function Distributed.manage(manager::SlurmManager, id::Integer, config::WorkerConfig, op::Symbol) # This function needs to exist, but so far we don't do anything end