Skip to content

[hyperactor] add a "direct" variant to ProcIds #787

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

Closed
wants to merge 5 commits into from
Closed

[hyperactor] add a "direct" variant to ProcIds #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc3ce43
[hyperactor] add a "direct" variant to ProcIds
mariusae Aug 7, 2025
e6abb95
Update on "[hyperactor] add a "direct" variant to ProcIds"
mariusae Aug 7, 2025
394494b
Update on "[hyperactor] add a "direct" variant to ProcIds"
mariusae Aug 7, 2025
bcc5ba3
Update on "[hyperactor] add a "direct" variant to ProcIds"
mariusae Aug 8, 2025
599bdf1
Update on "[hyperactor] add a "direct" variant to ProcIds"
mariusae Aug 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
55 changes: 47 additions & 8 deletions controller/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ impl ControllerActor {
) -> Result<(ActorHandle<ProcActor>, ActorRef<ControllerActor>), anyhow::Error> {
let bootstrap = ProcActor::bootstrap(
controller_id.proc_id().clone(),
controller_id.proc_id().world_id().clone(), // REFACTOR(marius): make world_id a parameter of ControllerActor::bootstrap
controller_id
.proc_id()
.world_id()
.expect("multiprocess supports only ranked procs")
.clone(), // REFACTOR(marius): make world_id a parameter of ControllerActor::bootstrap
listen_addr,
bootstrap_addr.clone(),
supervision_update_interval,
Expand Down Expand Up @@ -685,7 +689,12 @@ mod tests {
world_size: 1,
comm_actor_ref: comm_handle.bind(),
worker_gang_ref: GangId(
WorldId(proc.proc_id().world_name().to_string()),
WorldId(
proc.proc_id()
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down Expand Up @@ -869,7 +878,12 @@ mod tests {
world_size: 1,
comm_actor_ref: comm_handle.bind(),
worker_gang_ref: GangId(
WorldId(proc.proc_id().world_name().to_string()),
WorldId(
proc.proc_id()
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down Expand Up @@ -975,7 +989,12 @@ mod tests {
.await
.unwrap();

let world_id = WorldId(proc.proc_id().world_name().to_string());
let world_id = WorldId(
proc.proc_id()
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
);
let controller_handle = proc
.spawn::<ControllerActor>(
"controller",
Expand Down Expand Up @@ -1500,7 +1519,12 @@ mod tests {
world_size: 1,
comm_actor_ref: ActorRef::attest(controller_id.proc_id().actor_id("comm", 0)),
worker_gang_ref: GangId(
WorldId(proc_id.world_name().to_string()),
WorldId(
proc_id
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down Expand Up @@ -1591,7 +1615,12 @@ mod tests {
world_size: 1,
comm_actor_ref: ActorRef::attest(controller_id.proc_id().actor_id("comm", 0)),
worker_gang_ref: GangId(
WorldId(proc_id.world_name().to_string()),
WorldId(
proc_id
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down Expand Up @@ -1692,7 +1721,12 @@ mod tests {
world_size: 1,
comm_actor_ref: ActorRef::attest(controller_id.proc_id().actor_id("comm", 0)),
worker_gang_ref: GangId(
WorldId(proc_id.world_name().to_string()),
WorldId(
proc_id
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down Expand Up @@ -1835,7 +1869,12 @@ mod tests {
world_size: 1,
comm_actor_ref: ActorRef::attest(controller_id.proc_id().actor_id("comm", 0)),
worker_gang_ref: GangId(
WorldId(proc_id.world_name().to_string()),
WorldId(
proc_id
.world_name()
.expect("only ranked actors are supported in the controller tests")
.to_string(),
),
"worker".to_string(),
)
.into(),
Expand Down
5 changes: 4 additions & 1 deletion hyper/src/commands/demo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ impl DemoCommand {

let proc_actor = ProcActor::bootstrap(
proc_id.clone(),
proc_id.0.clone(),
proc_id
.world_id()
.expect("unranked proc not supported")
.clone(),
addr,
system_addr,
Duration::from_secs(5),
Expand Down
10 changes: 7 additions & 3 deletions hyperactor/src/mailbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! # use hyperactor::mailbox::Mailbox;
//! # use hyperactor::reference::{ActorId, ProcId, WorldId};
//! # tokio_test::block_on(async {
//! # let proc_id = ProcId(WorldId("world".to_string()), 0);
//! # let proc_id = ProcId::Ranked(WorldId("world".to_string()), 0);
//! # let actor_id = ActorId(proc_id, "actor".to_string(), 0);
//! let mbox = Mailbox::new_detached(actor_id);
//! let (port, mut receiver) = mbox.open_port::<u64>();
Expand All @@ -36,7 +36,7 @@
//! # use hyperactor::mailbox::Mailbox;
//! # use hyperactor::reference::{ActorId, ProcId, WorldId};
//! # tokio_test::block_on(async {
//! # let proc_id = ProcId(WorldId("world".to_string()), 0);
//! # let proc_id = ProcId::Ranked(WorldId("world".to_string()), 0);
//! # let actor_id = ActorId(proc_id, "actor".to_string(), 0);
//! let mbox = Mailbox::new_detached(actor_id);
//!
Expand Down Expand Up @@ -2517,7 +2517,11 @@ mod tests {
#[test]
fn test_error() {
let err = MailboxError::new(
ActorId(ProcId(WorldId("myworld".into()), 2), "myactor".into(), 5),
ActorId(
ProcId::Ranked(WorldId("myworld".to_string()), 2),
"myactor".to_string(),
5,
),
MailboxErrorKind::Closed,
);
assert_eq!(format!("{}", err), "myworld[2].myactor[5]: mailbox closed");
Expand Down
2 changes: 1 addition & 1 deletion hyperactor/src/proc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ impl Proc {
pub fn local() -> Self {
// TODO: name these something that is ~ globally unique, e.g., incorporate
// the hostname, some GUID, etc.
let proc_id = ProcId(id!(local), NEXT_LOCAL_RANK.fetch_add(1, Ordering::Relaxed));
let proc_id = ProcId::Ranked(id!(local), NEXT_LOCAL_RANK.fetch_add(1, Ordering::Relaxed));
// TODO: make it so that local procs can talk to each other.
Proc::new(proc_id, BoxedMailboxSender::new(PanickingMailboxSender))
}
Expand Down
Loading