Skip to content

Use ElasticClusterManager #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 8, 2025
Merged

Use ElasticClusterManager #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
809eed2
Change package imports in CustomClusterManagers
oschulz Mar 28, 2025
3f0c358
Apply improvements from package ElasticClusterManager to CustomCluste…
oschulz Mar 28, 2025
cd5c63d
Use package ElasticClusterManager, remove CustomClusterManagers
oschulz Mar 28, 2025
893f081
Increase package version to v0.4.8
oschulz Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name = "ParallelProcessingTools"
uuid = "8e8a01fc-6193-5ca1-a2f1-20776dae4199"
version = "0.4.7"
version = "0.4.8"

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

[compat]
ArgCheck = "1, 2"
ClusterManagers = "0.4.6, 1"
ElasticClusterManager = "2"
Distributed = "1"
LinearAlgebra = "1"
Logging = "1"
Expand Down
13 changes: 6 additions & 7 deletions src/ParallelProcessingTools.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ import Pkg
import Random # Required by ThreadPinning extention
import Sockets

import ClusterManagers

using Base: Process
using Logging: @logmsg, LogLevel, Info, Debug

using ArgCheck: @argcheck
using Parameters: @with_kw

# # ToDo: Remove CustomClusterManagers once changes to ElasticManager have
# # have been upstreamed.
#using CustomClusterManagers: ElasticManager
include("custom_cluster_managers.jl")
using .CustomClusterManagers: ElasticManager
using ElasticClusterManager: ElasticManager, elastic_worker

# For backward compatibility:
module CustomClusterManagers
import ElasticClusterManager.ElasticManager
end

include("memory.jl")
include("display.jl")
Expand Down
180 changes: 0 additions & 180 deletions src/custom_cluster_managers.jl
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/runworkers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function ppt_cluster_manager()
end

"""
ParallelProcessingTools.ppt_cluster_manager!(manager::CustomClusterManagers.ElasticManager)
ParallelProcessingTools.ppt_cluster_manager!(manager::ElasticClusterManager.ElasticManager)

Set the default ParallelProcessingTools cluster manager.
"""
Expand Down Expand Up @@ -260,7 +260,7 @@ function _elastic_worker_startjl(
socket_name = manager.sockname
address = string(socket_name[1])
port = convert(Int, socket_name[2])
"""import ParallelProcessingTools; ParallelProcessingTools.CustomClusterManagers.elastic_worker("$cookie", "$address", $port, stdout_to_master=$redirect_output, env=$env_vec)"""
"""import ParallelProcessingTools; ParallelProcessingTools.elastic_worker("$cookie", "$address", $port, forward_stdout=$redirect_output, env=$env_vec)"""
end

const _default_addprocs_params = Distributed.default_addprocs_params()
Expand Down
Loading