Skip to content
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

lighthouse, manager: remove room support #70

Merged
merged 1 commit into from
Jan 13, 2025
Merged

lighthouse, manager: remove room support #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 4 additions & 12 deletions proto/torchft.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ message Quorum {
}

message LighthouseQuorumRequest {
// room_id is the specific quorum channel to use. All workers/replicas
// participating in the quorum must specify the same channel.
// Multiple channels can be active simultaneously.
string room_id = 1;
QuorumMember requester = 2;
QuorumMember requester = 1;
}

message LighthouseQuorumResponse {
Expand All @@ -73,13 +69,9 @@ service LighthouseService {
}

message ManagerQuorumRequest {
// room_id is the specific quorum channel to use. All workers/replicas
// participating in the quorum must specify the same channel.
// Multiple channels can be active simultaneously.
string room_id = 1;
int64 rank = 2;
int64 step = 3;
string checkpoint_server_addr = 4;
int64 rank = 1;
int64 step = 2;
string checkpoint_server_addr = 3;
}

message ManagerQuorumResponse {
Expand Down
4 changes: 1 addition & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,17 @@ impl ManagerClient {
})
}

#[pyo3(signature = (room_id, rank, step, checkpoint_server_addr, timeout=None))]
#[pyo3(signature = (rank, step, checkpoint_server_addr, timeout=None))]
fn quorum(
&mut self,
py: Python<'_>,
room_id: String,
rank: i64,
step: i64,
checkpoint_server_addr: String,
timeout: Option<Duration>,
) -> Result<(i64, i64, i64, String, String, i64, Option<i64>, i64, bool), StatusError> {
py.allow_threads(move || {
let mut request = tonic::Request::new(ManagerQuorumRequest {
room_id: room_id,
rank: rank,
step: step,
checkpoint_server_addr: checkpoint_server_addr,
Expand Down
Loading
Loading