Add PythonActorMeshRef

Differential Revision: D78284705

Author: pzhan9

hyperactor_mesh/src/actor_mesh.rs

@@ -145,7 +145,6 @@ pub trait ActorMesh: Mesh<Id = ActorMeshId> {
                 self.name().to_string(),
             ),
             self.shape().clone(),
-            self.proc_mesh().shape().clone(),
             self.proc_mesh().comm_actor().clone(),
         )
     }

hyperactor_mesh/src/reference.rs

@@ -75,8 +75,6 @@ pub struct ActorMeshId(pub ProcMeshId, pub String);
 pub struct ActorMeshRef<A: RemoteActor> {
     pub(crate) mesh_id: ActorMeshId,
     shape: Shape,
-    /// The shape of the underlying Proc Mesh.
-    proc_mesh_shape: Shape,
     /// The reference to the comm actor of the underlying Proc Mesh.
     comm_actor_ref: ActorRef<CommActor>,
     phantom: PhantomData<A>,
@@ -90,13 +88,11 @@ impl<A: RemoteActor> ActorMeshRef<A> {
     pub(crate) fn attest(
         mesh_id: ActorMeshId,
         shape: Shape,
-        proc_mesh_shape: Shape,
         comm_actor_ref: ActorRef<CommActor>,
     ) -> Self {
         Self {
             mesh_id,
             shape,
-            proc_mesh_shape,
             comm_actor_ref,
             phantom: PhantomData,
         }
@@ -142,7 +138,6 @@ impl<A: RemoteActor> Clone for ActorMeshRef<A> {
         Self {
             mesh_id: self.mesh_id.clone(),
             shape: self.shape.clone(),
-            proc_mesh_shape: self.proc_mesh_shape.clone(),
             comm_actor_ref: self.comm_actor_ref.clone(),
             phantom: PhantomData,
         }
@@ -161,12 +156,11 @@ impl<A: RemoteActor> Eq for ActorMeshRef<A> {}
 mod tests {
     use async_trait::async_trait;
     use hyperactor::Actor;
+    use hyperactor::Bind;
     use hyperactor::Context;
     use hyperactor::Handler;
     use hyperactor::PortRef;
-    use hyperactor::message::Bind;
-    use hyperactor::message::Bindings;
-    use hyperactor::message::Unbind;
+    use hyperactor::Unbind;
     use hyperactor_mesh_macros::sel;
     use ndslice::shape;
 
@@ -183,11 +177,11 @@ mod tests {
         shape! { replica = 4 }
     }
 
-    #[derive(Debug, Serialize, Deserialize, Named, Clone)]
+    #[derive(Debug, Serialize, Deserialize, Named, Clone, Bind, Unbind)]
     struct MeshPingPongMessage(
         /*ttl:*/ u64,
         ActorMeshRef<MeshPingPongActor>,
-        /*completed port:*/ PortRef<bool>,
+        /*completed port:*/ #[binding(include)] PortRef<bool>,
     );
 
     #[derive(Debug, Clone)]
@@ -203,7 +197,6 @@ mod tests {
     struct MeshPingPongActorParams {
         mesh_id: ActorMeshId,
         shape: Shape,
-        proc_mesh_shape: Shape,
         comm_actor_ref: ActorRef<CommActor>,
     }
 
@@ -213,12 +206,7 @@ mod tests {
 
         async fn new(params: Self::Params) -> Result<Self, anyhow::Error> {
             Ok(Self {
-                mesh_ref: ActorMeshRef::attest(
-                    params.mesh_id,
-                    params.shape,
-                    params.proc_mesh_shape,
-                    params.comm_actor_ref,
-                ),
+                mesh_ref: ActorMeshRef::attest(params.mesh_id, params.shape, params.comm_actor_ref),
             })
         }
     }
@@ -240,18 +228,6 @@ mod tests {
         }
     }
 
-    impl Unbind for MeshPingPongMessage {
-        fn unbind(&self, bindings: &mut Bindings) -> anyhow::Result<()> {
-            self.2.unbind(bindings)
-        }
-    }
-
-    impl Bind for MeshPingPongMessage {
-        fn bind(&mut self, bindings: &mut Bindings) -> anyhow::Result<()> {
-            self.2.bind(bindings)
-        }
-    }
-
     #[tokio::test]
     async fn test_inter_mesh_ping_pong() {
         let alloc_ping = LocalAllocator
@@ -278,7 +254,6 @@ mod tests {
                         "ping".to_string(),
                     ),
                     shape: ping_proc_mesh.shape().clone(),
-                    proc_mesh_shape: ping_proc_mesh.shape().clone(),
                     comm_actor_ref: ping_proc_mesh.comm_actor().clone(),
                 },
             )
@@ -296,7 +271,6 @@ mod tests {
                         "pong".to_string(),
                     ),
                     shape: pong_proc_mesh.shape().clone(),
-                    proc_mesh_shape: pong_proc_mesh.shape().clone(),
                     comm_actor_ref: pong_proc_mesh.comm_actor().clone(),
                 },
             )

monarch_hyperactor/src/actor_mesh.rs

@@ -10,11 +10,17 @@ use hyperactor::ActorRef;
 use hyperactor_mesh::Mesh;
 use hyperactor_mesh::RootActorMesh;
 use hyperactor_mesh::actor_mesh::ActorMesh;
+use hyperactor_mesh::reference::ActorMeshRef;
 use hyperactor_mesh::shared_cell::SharedCell;
 use hyperactor_mesh::shared_cell::SharedCellRef;
 use pyo3::exceptions::PyException;
+use pyo3::exceptions::PyNotImplementedError;
 use pyo3::exceptions::PyRuntimeError;
+use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
+use pyo3::types::PyBytes;
+use serde::Deserialize;
+use serde::Serialize;
 
 use crate::actor::PythonActor;
 use crate::actor::PythonMessage;
@@ -40,6 +46,14 @@ impl PythonActorMesh {
             .borrow()
             .map_err(|_| PyRuntimeError::new_err("`PythonActorMesh` has already been stopped"))
     }
+
+    fn pickling_err(&self) -> PyErr {
+        PyErr::new::<PyNotImplementedError, _>(
+            "PythonActorMesh cannot be pickled. If applicable, use bind() \
+            to get a PythonActorMeshRef, and use that instead."
+                .to_string(),
+        )
+    }
 }
 
 #[pymethods]
@@ -51,6 +65,11 @@ impl PythonActorMesh {
         Ok(())
     }
 
+    fn bind(&self) -> PyResult<PythonActorMeshRef> {
+        let mesh = self.try_inner()?;
+        Ok(PythonActorMeshRef { inner: mesh.bind() })
+    }
+
     // Consider defining a "PythonActorRef", which carries specifically
     // a reference to python message actors.
     fn get(&self, rank: usize) -> PyResult<Option<PyActorId>> {
@@ -70,8 +89,68 @@ impl PythonActorMesh {
     fn shape(&self) -> PyResult<PyShape> {
         Ok(PyShape::from(self.try_inner()?.shape().clone()))
     }
+
+    // Override the pickling methods to provide a meaningful error message.
+    fn __reduce__(&self) -> PyResult<()> {
+        Err(self.pickling_err())
+    }
+
+    fn __reduce_ex__(&self, _proto: u8) -> PyResult<()> {
+        Err(self.pickling_err())
+    }
+}
+
+#[pyclass(
+    frozen,
+    name = "PythonActorMeshRef",
+    module = "monarch._rust_bindings.monarch_hyperactor.actor_mesh"
+)]
+#[derive(Debug, Serialize, Deserialize)]
+pub(super) struct PythonActorMeshRef {
+    inner: ActorMeshRef<PythonActor>,
+}
+
+#[pymethods]
+impl PythonActorMeshRef {
+    fn cast(
+        &self,
+        client: &PyMailbox,
+        selection: &PySelection,
+        message: &PythonMessage,
+    ) -> PyResult<()> {
+        self.inner
+            .cast(&client.inner, selection.inner().clone(), message.clone())
+            .map_err(|err| PyException::new_err(err.to_string()))?;
+        Ok(())
+    }
+
+    #[getter]
+    fn shape(&self) -> PyShape {
+        PyShape::from(self.inner.shape().clone())
+    }
+
+    #[staticmethod]
+    fn from_bytes(bytes: &Bound<'_, PyBytes>) -> PyResult<Self> {
+        bincode::deserialize(bytes.as_bytes())
+            .map_err(|e| PyErr::new::<PyValueError, _>(e.to_string()))
+    }
+
+    fn __reduce__<'py>(
+        slf: &Bound<'py, Self>,
+    ) -> PyResult<(Bound<'py, PyAny>, (Bound<'py, PyBytes>,))> {
+        let bytes = bincode::serialize(&*slf.borrow())
+            .map_err(|e| PyErr::new::<PyValueError, _>(e.to_string()))?;
+        let py_bytes = PyBytes::new(slf.py(), &bytes);
+        Ok((slf.as_any().getattr("from_bytes")?, (py_bytes,)))
+    }
+
+    fn __repr__(&self) -> String {
+        format!("{:?}", self)
+    }
 }
+
 pub fn register_python_bindings(hyperactor_mod: &Bound<'_, PyModule>) -> PyResult<()> {
     hyperactor_mod.add_class::<PythonActorMesh>()?;
+    hyperactor_mod.add_class::<PythonActorMeshRef>()?;
     Ok(())
 }

monarch_hyperactor/src/shape.rs

@@ -21,6 +21,7 @@ use crate::ndslice::PySlice;
     module = "monarch._rust_bindings.monarch_hyperactor.shape",
     frozen
 )]
+#[derive(Clone)]
 pub struct PyShape {
     pub(super) inner: Shape,
 }
@@ -112,6 +113,14 @@ impl PyShape {
         self.inner.slice().len()
     }
 
+    fn __eq__(&self, other: &Bound<'_, PyAny>) -> PyResult<bool> {
+        if let Ok(other) = other.extract::<PyShape>() {
+            Ok(self.inner == other.inner)
+        } else {
+            Ok(false)
+        }
+    }
+
     #[staticmethod]
     fn unity() -> PyShape {
         Shape::unity().into()

python/monarch/_rust_bindings/monarch_hyperactor/actor_mesh.pyi

@@ -6,6 +6,7 @@
 
 # pyre-strict
 
+from collections.abc import Mapping
 from typing import final
 
 from monarch._rust_bindings.monarch_hyperactor.actor import PythonMessage
@@ -14,8 +15,36 @@ from monarch._rust_bindings.monarch_hyperactor.proc import ActorId
 from monarch._rust_bindings.monarch_hyperactor.selection import Selection
 from monarch._rust_bindings.monarch_hyperactor.shape import Shape
 
+@final
+class PythonActorMeshRef:
+    """
+    A reference to a remote actor mesh over which PythonMessages can be sent.
+    """
+
+    def cast(
+        self, mailbox: Mailbox, selection: Selection, message: PythonMessage
+    ) -> None:
+        """Cast a message to the selected actors in the mesh."""
+        ...
+
+    @property
+    def shape(self) -> Shape:
+        """
+        The Shape object that describes how the rank of an actor
+        retrieved with get corresponds to coordinates in the
+        mesh.
+        """
+        ...
+
 @final
 class PythonActorMesh:
+    def bind(self) -> PythonActorMeshRef:
+        """
+        Bind this actor mesh. The returned mesh ref can be used to reach the
+        mesh remotely.
+        """
+        ...
+
     def cast(self, selection: Selection, message: PythonMessage) -> None:
         """
         Cast a message to the selected actors in the mesh.

python/monarch/_rust_bindings/monarch_hyperactor/bootstrap.pyi

@@ -4,4 +4,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-strict
+
 def bootstrap_main() -> None: ...

python/monarch/_rust_bindings/monarch_hyperactor/selection.pyi

@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-strict
+
 from typing import final
 
 @final

python/monarch/_rust_bindings/monarch_hyperactor/shape.pyi

@@ -4,8 +4,10 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-strict
+
 import collections.abc
-from typing import Dict, final, Iterator, List, overload, Sequence
+from typing import Any, Dict, final, Iterator, List, overload, Sequence
 
 @final
 class Slice:
@@ -71,11 +73,11 @@ class Slice:
 
     def __eq__(self, value: object) -> bool: ...
     def __hash__(self) -> int: ...
-    def __getnewargs_ex__(self) -> tuple[tuple, dict]: ...
+    def __getnewargs_ex__(self) -> tuple[tuple[Any], dict[Any, Any]]: ...
     @overload
     def __getitem__(self, i: int) -> int: ...
     @overload
-    def __getitem__(self, i: slice) -> tuple[int, ...]: ...
+    def __getitem__(self, i: slice[Any, Any, Any]) -> tuple[int, ...]: ...
     def __len__(self) -> int:
         """Returns the complete size of the slice."""
         ...
@@ -136,6 +138,7 @@ class Shape:
         """
         ...
     def __len__(self) -> int: ...
+    def __eq__(self, value: object) -> bool: ...
     @staticmethod
     def unity() -> "Shape": ...
 

python/monarch/_rust_bindings/monarch_hyperactor/telemetry.pyi

@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-strict
+
 import logging
 
 def forward_to_tracing(record: logging.LogRecord) -> None: