torchmonarch-nightly 2025.7.26__cp311-cp311-manylinux2014_x86_64.whl → 2025.7.28__cp311-cp311-manylinux2014_x86_64.whl

monarch/_src/actor/actor_mesh.py

@@ -29,8 +29,10 @@ from typing import (
     Iterable,
     Iterator,
     List,
+    Literal,
     NamedTuple,
     Optional,
+    overload,
     ParamSpec,
     Tuple,
     Type,
@@ -39,6 +41,7 @@ from typing import (
 )
 
 from monarch._rust_bindings.monarch_hyperactor.actor import (
+    MethodSpecifier,
     PanicFlag,
     PythonMessage,
     PythonMessageKind,
@@ -282,16 +285,18 @@ class ActorEndpoint(Endpoint[P, R]):
     def __init__(
         self,
         actor_mesh_ref: _ActorMeshRefImpl,
-        name: str,
+        name: MethodSpecifier,
         impl: Callable[Concatenate[Any, P], Awaitable[R]],
         mailbox: Mailbox,
-        propagator: Propagator = None,
+        propagator: Propagator,
+        explicit_response_port: bool,
     ) -> None:
         super().__init__(propagator)
         self._actor_mesh = actor_mesh_ref
         self._name = name
         self._signature: inspect.Signature = inspect.signature(impl)
         self._mailbox = mailbox
+        self._explicit_response_port = explicit_response_port
 
     def _supervise(self, r: HyPortReceiver | OncePortReceiver) -> Any:
         mesh = self._actor_mesh._actor_mesh
@@ -300,6 +305,12 @@ class ActorEndpoint(Endpoint[P, R]):
     def _call_name(self) -> Any:
         return self._name
 
+    def _check_arguments(self, args, kwargs):
+        if self._explicit_response_port:
+            self._signature.bind(None, None, *args, **kwargs)
+        else:
+            self._signature.bind(None, *args, **kwargs)
+
     def _send(
         self,
         args: Tuple[Any, ...],
@@ -312,7 +323,7 @@ class ActorEndpoint(Endpoint[P, R]):
 
         This sends the message to all actors but does not wait for any result.
         """
-        self._signature.bind(None, *args, **kwargs)
+        self._check_arguments(args, kwargs)
         objects, bytes = flatten((args, kwargs), _is_ref_or_mailbox)
         if all(not hasattr(obj, "__monarch_ref__") for obj in objects):
             message = PythonMessage(
@@ -336,23 +347,50 @@ class ActorEndpoint(Endpoint[P, R]):
         return PortTuple(p, PortReceiver(self._mailbox, self._supervise(r._receiver)))
 
     def _rref(self, args, kwargs):
-        self._signature.bind(None, *args, **kwargs)
+        self._check_arguments(args, kwargs)
         refs, bytes = flatten((args, kwargs), _is_ref_or_mailbox)
 
         return actor_rref(self, bytes, refs)
 
 
+@overload
+def as_endpoint(
+    not_an_endpoint: Callable[P, R],
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: Literal[False] = False,
+) -> Endpoint[P, R]: ...
+
+
+@overload
+def as_endpoint(
+    not_an_endpoint: Callable[Concatenate["PortProtocol[R]", P], None],
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: Literal[True],
+) -> Endpoint[P, R]: ...
+
+
 def as_endpoint(
-    not_an_endpoint: Callable[P, R], *, propagate: Propagator = None
-) -> Endpoint[P, R]:
+    not_an_endpoint: Any,
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: bool = False,
+):
     if not isinstance(not_an_endpoint, NotAnEndpoint):
         raise ValueError("expected an method of a spawned actor")
+    kind = (
+        MethodSpecifier.ExplicitPort
+        if explicit_response_port
+        else MethodSpecifier.ReturnsResponse
+    )
     return ActorEndpoint(
         not_an_endpoint._ref._actor_mesh_ref,
-        not_an_endpoint._name,
+        kind(not_an_endpoint._name),
         getattr(not_an_endpoint._ref, not_an_endpoint._name),
         not_an_endpoint._ref._mailbox,
         propagate,
+        explicit_response_port,
     )
 
 
@@ -598,7 +636,7 @@ class _Actor:
         mailbox: Mailbox,
         rank: int,
         shape: Shape,
-        method: str,
+        method_spec: MethodSpecifier,
         message: bytes,
         panic_flag: PanicFlag,
         local_state: Iterable[Any],
@@ -616,17 +654,23 @@ class _Actor:
 
             args, kwargs = unflatten(message, local_state)
 
-            if method == "__init__":
-                Class, *args = args
-                try:
-                    self.instance = Class(*args, **kwargs)
-                except Exception as e:
-                    self._saved_error = ActorError(
-                        e, f"Remote actor {Class}.__init__ call failed."
-                    )
-                    raise e
-                port.send(None)
-                return None
+            match method_spec:
+                case MethodSpecifier.Init():
+                    Class, *args = args
+                    try:
+                        self.instance = Class(*args, **kwargs)
+                    except Exception as e:
+                        self._saved_error = ActorError(
+                            e, f"Remote actor {Class}.__init__ call failed."
+                        )
+                        raise e
+                    port.send(None)
+                    return None
+                case MethodSpecifier.ReturnsResponse(name=method):
+                    pass
+                case MethodSpecifier.ExplicitPort(name=method):
+                    args = (port, *args)
+                    port = DroppingPort()
 
             if self.instance is None:
                 # This could happen because of the following reasons. Both
@@ -775,15 +819,22 @@ class ActorMeshRef(MeshTrait):
         for attr_name in dir(self._class):
             attr_value = getattr(self._class, attr_name, None)
             if isinstance(attr_value, EndpointProperty):
+                # Convert string method name to appropriate MethodSpecifier
+                kind = (
+                    MethodSpecifier.ExplicitPort
+                    if attr_value._explicit_response_port
+                    else MethodSpecifier.ReturnsResponse
+                )
                 setattr(
                     self,
                     attr_name,
                     ActorEndpoint(
                         self._actor_mesh_ref,
-                        attr_name,
+                        kind(attr_name),
                         attr_value._method,
                         self._mailbox,
                         attr_value._propagator,
+                        attr_value._explicit_response_port,
                     ),
                 )
 
@@ -802,9 +853,11 @@ class ActorMeshRef(MeshTrait):
 
         ep = ActorEndpoint(
             self._actor_mesh_ref,
-            "__init__",
+            MethodSpecifier.Init(),
             null_func,
             self._mailbox,
+            None,
+            False,
         )
         send(ep, (self._class, *args), kwargs)
 

monarch/_src/actor/endpoint.py

@@ -223,16 +223,23 @@ class EndpointProperty(Generic[P, R]):
         self,
         method: Callable[Concatenate[Any, P], Awaitable[R]],
         propagator: Propagator,
+        explicit_response_port: bool,
     ) -> None: ...
 
     @overload
     def __init__(
-        self, method: Callable[Concatenate[Any, P], R], propagator: Propagator
+        self,
+        method: Callable[Concatenate[Any, P], R],
+        propagator: Propagator,
+        explicit_response_port: bool,
     ) -> None: ...
 
-    def __init__(self, method: Any, propagator: Propagator) -> None:
+    def __init__(
+        self, method: Any, propagator: Propagator, explicit_response_port: bool
+    ) -> None:
         self._method = method
         self._propagator = propagator
+        self._explicit_response_port = explicit_response_port
 
     def __get__(self, instance, owner) -> Endpoint[P, R]:
         # this is a total lie, but we have to actually
@@ -274,11 +281,28 @@ class EndpointIfy:
         pass
 
 
+class PortedEndpointIfy:
+    @overload
+    def __call__(
+        self,
+        function: Callable[Concatenate[Any, "Port[R]", P], Awaitable[None]],
+    ) -> Endpoint[P, R]: ...
+
+    @overload
+    def __call__(
+        self, function: Callable[Concatenate[Any, "Port[R]", P], None]
+    ) -> Endpoint[P, R]: ...
+
+    def __call__(self, function: Any):
+        pass
+
+
 @overload
 def endpoint(
     method: Callable[Concatenate[Any, P], Awaitable[R]],
     *,
     propagate: Propagator = None,
+    explicit_response_port: Literal[False] = False,
 ) -> EndpointProperty[P, R]: ...
 
 
@@ -287,6 +311,7 @@ def endpoint(
     method: Callable[Concatenate[Any, P], R],
     *,
     propagate: Propagator = None,
+    explicit_response_port: Literal[False] = False,
 ) -> EndpointProperty[P, R]: ...
 
 
@@ -294,10 +319,43 @@ def endpoint(
 def endpoint(
     *,
     propagate: Propagator = None,
+    explicit_response_port: Literal[False] = False,
 ) -> EndpointIfy: ...
 
 
-def endpoint(method=None, *, propagate=None):
+@overload
+def endpoint(
+    method: Callable[Concatenate[Any, "Port[R]", P], Awaitable[None]],
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: Literal[True],
+) -> EndpointProperty[P, R]: ...
+
+
+@overload
+def endpoint(
+    method: Callable[Concatenate[Any, "Port[R]", P], None],
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: Literal[True],
+) -> EndpointProperty[P, R]: ...
+
+
+@overload
+def endpoint(
+    *,
+    propagate: Propagator = None,
+    explicit_response_port: Literal[True],
+) -> PortedEndpointIfy: ...
+
+
+def endpoint(method=None, *, propagate=None, explicit_response_port: bool = False):
     if method is None:
-        return functools.partial(endpoint, propagate=propagate)
-    return EndpointProperty(method, propagator=propagate)
+        return functools.partial(
+            endpoint,
+            propagate=propagate,
+            explicit_response_port=explicit_response_port,
+        )
+    return EndpointProperty(
+        method, propagator=propagate, explicit_response_port=explicit_response_port
+    )

tests/test_python_actors.py

@@ -586,3 +586,15 @@ class TestActorMeshStop(unittest.IsolatedAsyncioTestCase):
 
         await am_2.print.call("hello 3")
         await am_2.log.call("hello 4")
+
+
+class PortedActor(Actor):
+    @endpoint(explicit_response_port=True)
+    def add(self, port: "Port[int]", b: int) -> None:
+        port.send(3 + b)
+
+
+def test_ported_actor():
+    proc_mesh = local_proc_mesh(gpus=1).get()
+    a = proc_mesh.spawn("port_actor", PortedActor).get()
+    assert 5 == a.add.call_one(2).get()

{torchmonarch_nightly-2025.7.26.dist-info → torchmonarch_nightly-2025.7.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torchmonarch-nightly
-Version: 2025.7.26
+Version: 2025.7.28
 Summary: Monarch: Single controller library
 Author: Meta
 Author-email: oncall+monarch@xmail.facebook.com

{torchmonarch_nightly-2025.7.26.dist-info → torchmonarch_nightly-2025.7.28.dist-info}/RECORD

@@ -1,5 +1,5 @@
 monarch/__init__.py,sha256=mgKiyD1kxky-1pvhMlNfF4VmxWnhi-FSYZNFzkW1BEM,7052
-monarch/_rust_bindings.so,sha256=pvUGrYVAW1JrVgti7IJsFSb7Va0vWTB95RvoOgAIXGE,47520848
+monarch/_rust_bindings.so,sha256=crjfqvnpPBQUV-9OeCrlZ0WBq8xEcJyX8mvK1yWsp-8,50483080
 monarch/_testing.py,sha256=_3MYNMq-_0T1qXCj2vxrW13GlWGdUuVFMskQF2Gsw_o,7877
 monarch/actor_mesh.py,sha256=VtPU9syi_vUdwDSJJ639Z4Y_EcWZUScyoj0lQ88RQPs,421
 monarch/bootstrap_main.py,sha256=39OZpNMrfvvNJf-iwuNzgslzYA_ItaRPHfXGn_V74N0,524
@@ -8,7 +8,7 @@ monarch/fetch.py,sha256=JMxC8HdWMvpik0T4E6e-gfxvmNnOkA0ul4eo4R3Jg_o,1712
 monarch/gradient_generator.py,sha256=Rl3dmXGceTdCc1mYBg2JciR88ywGPnW7TVkL86KwqEA,6366
 monarch/memory.py,sha256=ol86dBhFAJqg78iF25-BuK0wuwj1onR8FIioZ_B0gjw,1377
 monarch/mesh_controller.py,sha256=mOk2misobJun2AgR_ALjFoopAEcOPYQVrrAJXa18ZTs,13810
-monarch/monarch_controller,sha256=1gXdTNolxIUp_88alJnW1onBHseo5PzuNnjEnBte4wI,21243128
+monarch/monarch_controller,sha256=untvTxNKGEpzfX3Eh2InHETFphEaRgzxwWPwHWdroOg,24053432
 monarch/notebook.py,sha256=zu9MKDFKf1-rCM2TqFSRJjMBeiWuKcJSyUFLvoZRQzs,25949
 monarch/opaque_module.py,sha256=jCcg0DjbcEVXA9WNG0NhUzGteLHOJLTZEBvrIYJIAns,10436
 monarch/opaque_object.py,sha256=x1LoX6RIMGh4ux52xIfhPgoh6PhZHdkf9bMccHW3DW0,2808
@@ -25,12 +25,12 @@ monarch/tensorboard.py,sha256=MnLgH5lbqeUJauEuirEgR6L_qYl2NGdtwZOWIAuOZao,2587
 monarch/world_mesh.py,sha256=ob5dJWaC49Uw0xqClHBm8CQLvL4xKnjd4TGzk7k8NxI,980
 monarch/_src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monarch/_src/actor/__init__.py,sha256=4iK3nzQZmEPe0HGNY70fABBenw3lCVVaaF0xddF5Fa0,235
-monarch/_src/actor/actor_mesh.py,sha256=guYD9nZHguLGJAvTisc3Q664ASkupcNC6z9iheeGFUQ,29188
+monarch/_src/actor/actor_mesh.py,sha256=wmFUf3NJcHmJeK7WrLkGOrzmAvdHmjLUaeQ5W6WDLk0,30867
 monarch/_src/actor/allocator.py,sha256=WpHEK1SvjgF3GdIWIYUkonXli2-gQVKJVZPInl2RFQo,8212
 monarch/_src/actor/bootstrap_main.py,sha256=e5eU3GvX60MWWmCty7VcZrAmukD29iJdWBysNgQ2o3A,2342
 monarch/_src/actor/debugger.py,sha256=t2iAAxz03b2KZ89T3VjRc__7GzSf83R8gM81SDyX3-o,19532
 monarch/_src/actor/device_utils.py,sha256=gBpl23wMjppVAEzzj8U9HyX-B7Bs2_3ftiMAkzUS4j4,577
-monarch/_src/actor/endpoint.py,sha256=jM3XYWze6gB6ajE4AMojNFSN4IaaxgioNAErJkkywjE,9721
+monarch/_src/actor/endpoint.py,sha256=HCOGXe8dhvkqfeIaEF_PO1ZqJzk1wOUlTf8ogjklY84,11189
 monarch/_src/actor/event_loop.py,sha256=2i4fKIkemBzua_t47BqVa2roZ6fWB6sbmMFPNx2zKN0,2832
 monarch/_src/actor/future.py,sha256=jOGh1wfwKyGJxhl9t1P8eapXYywf8KwQldZCCbupmb8,4042
 monarch/_src/actor/pdb_wrapper.py,sha256=-QxRktntdEO2LdHixBGKLboYtADyh8bEIAoa3gFwIEo,4161
@@ -157,7 +157,7 @@ tests/test_future.py,sha256=cXzaNi2YDwVyjR541ScXmgktX1YFsKzbl8wep0DMVbk,3032
 tests/test_grad_generator.py,sha256=p4Pm4kMEeGldt2jUVAkGKCB0mLccKI28pltH6OTGbQA,3412
 tests/test_mock_cuda.py,sha256=5hisElxeLJ5MHw3KM9gwxBiXiMaG-Rm382u3AsQcDOI,3068
 tests/test_pdb_actor.py,sha256=5KJhuhcZDPWMdjC6eAtDdwnz1W7jNFXvIrMSFaCWaPw,3858
-tests/test_python_actors.py,sha256=fts3dfdld-zkpRaKyxEAOW6JFnG_jQspu1WehenwyI0,15220
+tests/test_python_actors.py,sha256=rkfMfMn8YPz58-HY4UUki2EL7a6XNZuAW-i8jBfd29o,15540
 tests/test_rdma.py,sha256=vgeCCsfOjRjlGoGR0SYRuTP_Sx5RlEUUKfO9ATK0d4E,6125
 tests/test_remote_functions.py,sha256=VT65W7htp1jCsP9-AsiO1dofhx-4OebWEOssDEgi3GM,51054
 tests/test_rust_backend.py,sha256=3TLu8dSVEqyLhjHED2DoAEQHTpbBQcr3WI6K2eGZLZw,7861
@@ -169,9 +169,9 @@ tests/simulator/test_profiling.py,sha256=TGYCfzTLdkpIwnOuO6KApprmrgPIRQe60KRX3wk
 tests/simulator/test_simulator.py,sha256=LO8lA0ssY-OGEBL5ipEu74f97Y765TEwfUOv-DtIptM,14568
 tests/simulator/test_task.py,sha256=ipqBDuDAysuo1xOB9S5psaFvwe6VATD43IovCTSs0t4,2327
 tests/simulator/test_worker.py,sha256=QrWWIJ3HDgDLkBPRc2mwYPlOQoXQcj1qRfc0WUfKkFY,3507
-torchmonarch_nightly-2025.7.26.dist-info/licenses/LICENSE,sha256=e0Eotbf_rHOYPuEUlppIbvwy4SN98CZnl_hqwvbDA4Q,1530
-torchmonarch_nightly-2025.7.26.dist-info/METADATA,sha256=rJuOVCi7kVf2R9tHhtMSlaWv80ybWS5g9MvMzmso5M8,3852
-torchmonarch_nightly-2025.7.26.dist-info/WHEEL,sha256=JC9FVdjbTDi9l3EyrqUd11CgmN9LkBi1g5dFHayafwA,104
-torchmonarch_nightly-2025.7.26.dist-info/entry_points.txt,sha256=60QVSpYVzkzS4iDOiLp0fsLxVp47X3J2l3v7W-59LMo,117
-torchmonarch_nightly-2025.7.26.dist-info/top_level.txt,sha256=E-ZssZzyM17glpVrh-S9--qJ-w9p2EjuYOuNw9tQ4Eg,33
-torchmonarch_nightly-2025.7.26.dist-info/RECORD,,
+torchmonarch_nightly-2025.7.28.dist-info/licenses/LICENSE,sha256=e0Eotbf_rHOYPuEUlppIbvwy4SN98CZnl_hqwvbDA4Q,1530
+torchmonarch_nightly-2025.7.28.dist-info/METADATA,sha256=empMLiZrrLDR6taSJTViJ0CSOI3B1Jc6kI3H6wDNd8w,3852
+torchmonarch_nightly-2025.7.28.dist-info/WHEEL,sha256=JC9FVdjbTDi9l3EyrqUd11CgmN9LkBi1g5dFHayafwA,104
+torchmonarch_nightly-2025.7.28.dist-info/entry_points.txt,sha256=60QVSpYVzkzS4iDOiLp0fsLxVp47X3J2l3v7W-59LMo,117
+torchmonarch_nightly-2025.7.28.dist-info/top_level.txt,sha256=E-ZssZzyM17glpVrh-S9--qJ-w9p2EjuYOuNw9tQ4Eg,33
+torchmonarch_nightly-2025.7.28.dist-info/RECORD,,