Move to monarch_hyperactor crate

Summary:
I'm actually not 100% the best crate for this, but I'm moving to allow grabbing
a dep onto pyo3 and some other crates w/o polluting hyperactor_mesh.

Reviewed By: highker

Differential Revision: D78366881

Author: andrewjcg

hyperactor_mesh/Cargo.toml

@@ -25,7 +25,6 @@ path = "test/process_allocator_cleanup/process_allocator_cleanup.rs"
 
 [dependencies]
 anyhow = "1.0.98"
-async-once-cell = "0.4.2"
 async-trait = "0.1.86"
 bincode = "1.3.3"
 bitmaps = "3.2.1"
@@ -50,7 +49,6 @@ serde_bytes = "0.11"
 serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "unbounded_depth"] }
 signal-hook = "0.3"
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-tempfile = "3.15"
 thiserror = "2.0.12"
 tokio = { version = "1.45.0", features = ["full", "test-util", "tracing"] }
 tokio-stream = { version = "0.1.17", features = ["fs", "io-util", "net", "signal", "sync", "time"] }
@@ -59,7 +57,6 @@ tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
 tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }
 
 [dev-dependencies]
-dir-diff = "0.3"
 maplit = "1.0"
 timed_test = { version = "0.0.0", path = "../timed_test" }
 

hyperactor_mesh/src/lib.rs

@@ -16,7 +16,6 @@ pub mod actor_mesh;
 pub mod alloc;
 mod assign;
 pub mod bootstrap;
-pub mod code_sync;
 pub mod comm;
 pub mod connect;
 pub mod logging;

hyperactor_mesh/src/reference.rs

@@ -93,11 +93,7 @@ impl<A: RemoteActor> ActorMeshRef<A> {
     /// typed reference.  This is usually invoked to provide a guarantee
     /// that an externally-provided mesh ID (e.g., through a command
     /// line argument) is a valid reference.
-    pub(crate) fn attest(
-        mesh_id: ActorMeshId,
-        root: Shape,
-        comm_actor_ref: ActorRef<CommActor>,
-    ) -> Self {
+    pub fn attest(mesh_id: ActorMeshId, root: Shape, comm_actor_ref: ActorRef<CommActor>) -> Self {
         Self {
             mesh_id,
             root,

monarch_extension/src/code_sync.rs

@@ -15,13 +15,13 @@ use futures::TryFutureExt;
 use futures::future::try_join_all;
 use hyperactor_mesh::Mesh;
 use hyperactor_mesh::RootActorMesh;
-use hyperactor_mesh::code_sync::WorkspaceLocation;
-use hyperactor_mesh::code_sync::manager::CodeSyncManager;
-use hyperactor_mesh::code_sync::manager::CodeSyncManagerParams;
-use hyperactor_mesh::code_sync::manager::WorkspaceConfig;
-use hyperactor_mesh::code_sync::manager::WorkspaceShape;
-use hyperactor_mesh::code_sync::manager::code_sync_mesh;
 use hyperactor_mesh::shared_cell::SharedCell;
+use monarch_hyperactor::code_sync::WorkspaceLocation;
+use monarch_hyperactor::code_sync::manager::CodeSyncManager;
+use monarch_hyperactor::code_sync::manager::CodeSyncManagerParams;
+use monarch_hyperactor::code_sync::manager::WorkspaceConfig;
+use monarch_hyperactor::code_sync::manager::WorkspaceShape;
+use monarch_hyperactor::code_sync::manager::code_sync_mesh;
 use monarch_hyperactor::proc_mesh::PyProcMesh;
 use monarch_hyperactor::runtime::signal_safe_block_on;
 use pyo3::Bound;

monarch_hyperactor/Cargo.toml

@@ -9,22 +9,30 @@ license = "BSD-3-Clause"
 
 [dependencies]
 anyhow = "1.0.98"
+async-once-cell = "0.4.2"
 async-trait = "0.1.86"
 bincode = "1.3.3"
 clap = { version = "4.5.38", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 erased-serde = "0.3.27"
 fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
+futures = { version = "0.3.30", features = ["async-await", "compat"] }
+futures-util = { version = "0.3.30", features = ["compat"] }
 hyperactor = { version = "0.0.0", path = "../hyperactor" }
 hyperactor_mesh = { version = "0.0.0", path = "../hyperactor_mesh" }
 hyperactor_multiprocess = { version = "0.0.0", path = "../hyperactor_multiprocess" }
 hyperactor_telemetry = { version = "0.0.0", path = "../hyperactor_telemetry" }
 inventory = "0.3.8"
 monarch_types = { version = "0.0.0", path = "../monarch_types" }
 ndslice = { version = "0.0.0", path = "../ndslice" }
+nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
 pyo3 = { version = "0.24", features = ["anyhow", "multiple-pymethods"] }
 pyo3-async-runtimes = { version = "0.24", features = ["attributes", "tokio-runtime"] }
 serde = { version = "1.0.185", features = ["derive", "rc"] }
 serde_bytes = "0.11"
+tempfile = "3.15"
 thiserror = "2.0.12"
 tokio = { version = "1.45.0", features = ["full", "test-util", "tracing"] }
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
+
+[dev-dependencies]
+dir-diff = "0.3"

hyperactor_mesh/src/code_sync.rs renamed to monarch_hyperactor/src/code_sync.rs

@@ -28,6 +28,15 @@ use hyperactor::Named;
 use hyperactor::PortRef;
 use hyperactor::Unbind;
 use hyperactor::forward;
+use hyperactor_mesh::RootActorMesh;
+use hyperactor_mesh::SlicedActorMesh;
+use hyperactor_mesh::actor_mesh::ActorMesh;
+use hyperactor_mesh::connect::Connect;
+use hyperactor_mesh::connect::accept;
+use hyperactor_mesh::reference::ActorMeshId;
+use hyperactor_mesh::reference::ActorMeshRef;
+use hyperactor_mesh::reference::ProcMeshId;
+use hyperactor_mesh::sel;
 use ndslice::Selection;
 use ndslice::Shape;
 use ndslice::ShapeError;
@@ -36,21 +45,12 @@ use serde::Serialize;
 use tokio::net::TcpListener;
 use tokio::net::TcpStream;
 
-use crate::RootActorMesh;
-use crate::SlicedActorMesh;
-use crate::actor_mesh::ActorMesh;
 use crate::code_sync::WorkspaceLocation;
 use crate::code_sync::rsync::RsyncActor;
 use crate::code_sync::rsync::RsyncDaemon;
 use crate::code_sync::rsync::RsyncMessage;
 use crate::code_sync::rsync::RsyncParams;
 use crate::code_sync::rsync::RsyncResult;
-use crate::connect::Connect;
-use crate::connect::accept;
-use crate::reference::ActorMeshId;
-use crate::reference::ActorMeshRef;
-use crate::reference::ProcMeshId;
-use crate::sel;
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub enum Method {
@@ -310,15 +310,15 @@ pub async fn code_sync_mesh(
 #[cfg(test)]
 mod tests {
     use anyhow::anyhow;
+    use hyperactor_mesh::alloc::AllocSpec;
+    use hyperactor_mesh::alloc::Allocator;
+    use hyperactor_mesh::alloc::local::LocalAllocator;
+    use hyperactor_mesh::proc_mesh::ProcMesh;
     use ndslice::shape;
     use tempfile::TempDir;
     use tokio::fs;
 
     use super::*;
-    use crate::alloc::AllocSpec;
-    use crate::alloc::Allocator;
-    use crate::alloc::local::LocalAllocator;
-    use crate::proc_mesh::ProcMesh;
 
     #[test]
     fn test_workspace_shape_owners() {

hyperactor_mesh/src/code_sync/manager.rs renamed to monarch_hyperactor/src/code_sync/manager.rs

@@ -31,6 +31,10 @@ use hyperactor::PortRef;
 use hyperactor::Unbind;
 use hyperactor::clock::Clock;
 use hyperactor::clock::RealClock;
+use hyperactor_mesh::actor_mesh::ActorMesh;
+use hyperactor_mesh::connect::Connect;
+use hyperactor_mesh::connect::accept;
+use hyperactor_mesh::sel;
 use ndslice::Selection;
 use nix::sys::signal;
 use nix::sys::signal::Signal;
@@ -44,11 +48,7 @@ use tokio::net::TcpStream;
 use tokio::process::Child;
 use tokio::process::Command;
 
-use crate::actor_mesh::ActorMesh;
 use crate::code_sync::WorkspaceLocation;
-use crate::connect::Connect;
-use crate::connect::accept;
-use crate::sel;
 
 /// Represents a single file change from rsync
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -398,16 +398,16 @@ where
 mod tests {
     use anyhow::Result;
     use anyhow::anyhow;
+    use hyperactor_mesh::alloc::AllocSpec;
+    use hyperactor_mesh::alloc::Allocator;
+    use hyperactor_mesh::alloc::local::LocalAllocator;
+    use hyperactor_mesh::proc_mesh::ProcMesh;
     use ndslice::shape;
     use tempfile::TempDir;
     use tokio::fs;
     use tokio::net::TcpListener;
 
     use super::*;
-    use crate::alloc::AllocSpec;
-    use crate::alloc::Allocator;
-    use crate::alloc::local::LocalAllocator;
-    use crate::proc_mesh::ProcMesh;
 
     #[tokio::test]
     async fn test_simple() -> Result<()> {

hyperactor_mesh/src/code_sync/rsync.rs renamed to monarch_hyperactor/src/code_sync/rsync.rs

@@ -7,12 +7,14 @@
  */
 
 #![allow(unsafe_op_in_unsafe_fn)]
+#![feature(exit_status_error)]
 
 pub mod actor;
 pub mod actor_mesh;
 pub mod alloc;
 pub mod bootstrap;
 pub mod channel;
+pub mod code_sync;
 pub mod config;
 pub mod local_state_broker;
 pub mod mailbox;