Skip to content

Commit cd5c63d

Browse files
committed
Use package ElasticClusterManager, remove CustomClusterManagers
Improvements in internal module CustomClusterManagers have been ported to package ElasticClusterManager.
1 parent 3f0c358 commit cd5c63d

File tree

4 files changed

+10
-217
lines changed

4 files changed

+10
-217
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.4.7"
44

55
[deps]
66
ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"
7-
ClusterManagers = "34f1f09b-3a8b-5176-ab39-66d58a4d544e"
7+
ElasticClusterManager = "547eee1f-27c8-4193-bfd6-9e092c8e3331"
88
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
99
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1010
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -21,7 +21,7 @@ ParallelProcessingToolsThreadPinningExt = "ThreadPinning"
2121

2222
[compat]
2323
ArgCheck = "1, 2"
24-
ClusterManagers = "0.4.6, 1"
24+
ElasticClusterManager = "2"
2525
Distributed = "1"
2626
LinearAlgebra = "1"
2727
Logging = "1"

src/ParallelProcessingTools.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ import Pkg
1212
import Random # Required by ThreadPinning extention
1313
import Sockets
1414

15-
import ClusterManagers
16-
1715
using Base: Process
1816
using Logging: @logmsg, LogLevel, Info, Debug
1917

2018
using ArgCheck: @argcheck
2119
using Parameters: @with_kw
2220

23-
# # ToDo: Remove CustomClusterManagers once changes to ElasticManager have
24-
# # have been upstreamed.
25-
#using CustomClusterManagers: ElasticManager
26-
include("custom_cluster_managers.jl")
27-
using .CustomClusterManagers: ElasticManager
21+
using ElasticClusterManager: ElasticManager, elastic_worker
22+
23+
# For backward compatibility:
24+
module CustomClusterManagers
25+
import ElasticClusterManager.ElasticManager
26+
end
2827

2928
include("memory.jl")
3029
include("display.jl")

src/custom_cluster_managers.jl

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

src/runworkers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function ppt_cluster_manager()
141141
end
142142

143143
"""
144-
ParallelProcessingTools.ppt_cluster_manager!(manager::CustomClusterManagers.ElasticManager)
144+
ParallelProcessingTools.ppt_cluster_manager!(manager::ElasticClusterManager.ElasticManager)
145145
146146
Set the default ParallelProcessingTools cluster manager.
147147
"""
@@ -260,7 +260,7 @@ function _elastic_worker_startjl(
260260
socket_name = manager.sockname
261261
address = string(socket_name[1])
262262
port = convert(Int, socket_name[2])
263-
"""import ParallelProcessingTools; ParallelProcessingTools.CustomClusterManagers.elastic_worker("$cookie", "$address", $port, stdout_to_master=$redirect_output, env=$env_vec)"""
263+
"""import ParallelProcessingTools; ParallelProcessingTools.elastic_worker("$cookie", "$address", $port, forward_stdout=$redirect_output, env=$env_vec)"""
264264
end
265265

266266
const _default_addprocs_params = Distributed.default_addprocs_params()

0 commit comments

Comments
 (0)