modal 1.5.3.dev0__py3-none-any.whl → 1.5.3.dev2__py3-none-any.whl

modal/_functions.py

@@ -671,6 +671,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         # Experimental: Clustered functions
         cluster_size: int | None = None,
         rdma: bool | None = None,
+        fabric_size: int | None = None,
         single_use_containers: bool = False,
         ephemeral_disk: int | None = None,
         include_source: bool = True,
@@ -1009,6 +1010,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     mount_client_dependencies=mount_client_dependencies,
                     # ---
                     _experimental_group_size=cluster_size or 0,  # Experimental: Clustered functions
+                    _experimental_fabric_size=fabric_size or 0,  # Experimental: Clustered functions
                     _experimental_concurrent_cancellations=True,
                     # --- These are deprecated in favor of autoscaler_settings
                     warm_pool_size=min_containers or 0,
@@ -1051,6 +1053,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                         method_definitions_set=function_definition.method_definitions_set,
                         experimental_options=experimental_options or {},
                         _experimental_group_size=function_definition._experimental_group_size,
+                        _experimental_fabric_size=function_definition._experimental_fabric_size,
                         _experimental_buffer_containers=function_definition._experimental_buffer_containers,
                         _experimental_custom_scaling=function_definition._experimental_custom_scaling,
                         snapshot_debug=function_definition.snapshot_debug,

modal/_partial_function.py

@@ -74,6 +74,7 @@ class _PartialFunctionParams:
     target_concurrent_inputs: int | None = None
     build_timeout: int | None = None
     rdma: bool | None = None
+    fabric_size: int | None = None
     http_config: api_pb2.HTTPConfig | None = None
 
     def update(self, other: "_PartialFunctionParams") -> None:
@@ -777,7 +778,7 @@ def _concurrent(
 
 # NOTE: clustered is currently exposed through modal.experimental, not the top-level namespace
 def _clustered(
-    size: int, broadcast: bool = True, rdma: bool = False
+    size: int, broadcast: bool = True, rdma: bool = False, fabric_size: int | None = None
 ) -> Callable[
     [Callable[P, ReturnType] | _PartialFunction[P, ReturnType, ReturnType]],
     _PartialFunction[P, ReturnType, ReturnType],
@@ -791,6 +792,11 @@ def _clustered(
         If True, inputs will be sent simultaneously to each container. Otherwise,
         inputs will be sent only to the rank-0 container, which is responsible for
         delegating to the workers.
+    fabric_size: int | None = None
+        Experimental: constrains placement across GPU-memory fabrics. The cluster
+        is placed in co-fabric blocks of `fabric_size` containers, so every block
+        of `fabric_size` consecutive ranks shares a fabric (the scale-up domain)
+        and communicates over cross-node NVLink. Must evenly divide `size`.
     """
 
     assert broadcast, "broadcast=False has not been implemented yet!"
@@ -798,8 +804,14 @@ def _clustered(
     if size <= 0:
         raise ValueError("cluster size must be greater than 0")
 
+    if fabric_size is not None:
+        if not isinstance(fabric_size, int) or fabric_size <= 0:
+            raise ValueError("fabric_size must be a positive integer")
+        if size % fabric_size != 0:
+            raise ValueError(f"fabric_size must evenly divide the cluster size ({size} % {fabric_size} != 0)")
+
     flags = _PartialFunctionFlags.CLUSTERED
-    params = _PartialFunctionParams(cluster_size=size, rdma=rdma)
+    params = _PartialFunctionParams(cluster_size=size, rdma=rdma, fabric_size=fabric_size)
 
     def wrapper(
         obj: _PartialFunction[P, ReturnType, ReturnType] | Callable[P, ReturnType],

modal/app.py

@@ -920,6 +920,7 @@ class _App:
                 i6pn_enabled = i6pn or (f.flags & _PartialFunctionFlags.CLUSTERED)
                 cluster_size = f.params.cluster_size  # Experimental: Clustered functions
                 rdma = f.params.rdma
+                fabric_size = f.params.fabric_size
 
                 info = FunctionInfo(f.raw_f, serialized=serialized, name_override=name)
                 raw_f = f.raw_f
@@ -974,6 +975,7 @@ class _App:
 
                 cluster_size = None  # Experimental: Clustered functions
                 rdma = None
+                fabric_size = None
                 i6pn_enabled = i6pn
 
             if is_generator is None:
@@ -1016,6 +1018,7 @@ class _App:
                 i6pn_enabled=i6pn_enabled,
                 cluster_size=cluster_size,  # Experimental: Clustered functions
                 rdma=rdma,
+                fabric_size=fabric_size,  # Experimental: Clustered functions
                 include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 restrict_output=_experimental_restrict_output,
@@ -1151,16 +1154,19 @@ class _App:
                 if wrapped_cls.flags & _PartialFunctionFlags.CLUSTERED:
                     cluster_size = wrapped_cls.params.cluster_size
                     rdma = wrapped_cls.params.rdma
+                    fabric_size = wrapped_cls.params.fabric_size
 
                 else:
                     cluster_size = None
                     rdma = None
+                    fabric_size = None
             else:
                 user_cls = wrapped_cls
                 max_concurrent_inputs = None
                 target_concurrent_inputs = None
                 cluster_size = None
                 rdma = None
+                fabric_size = None
             if not inspect.isclass(user_cls):
                 raise TypeError("The @app.cls decorator must be used on a class.")
 
@@ -1246,6 +1252,7 @@ class _App:
                 i6pn_enabled=i6pn_enabled,
                 cluster_size=cluster_size,
                 rdma=rdma,
+                fabric_size=fabric_size,
                 include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 restrict_output=_experimental_restrict_output,
@@ -1403,6 +1410,7 @@ class _App:
             # Extract the underlying class if wrapped in a _PartialFunction (e.g., from @modal.clustered())
             cluster_size = None
             rdma = None
+            fabric_size = None
             user_cls = wrapped_user_cls
 
             if isinstance(wrapped_user_cls, _PartialFunction):
@@ -1410,6 +1418,7 @@ class _App:
                 if wrapped_user_cls.flags & _PartialFunctionFlags.CLUSTERED:
                     cluster_size = wrapped_user_cls.params.cluster_size
                     rdma = wrapped_user_cls.params.rdma
+                    fabric_size = wrapped_user_cls.params.fabric_size
 
             local_state = self._local_state
 
@@ -1449,6 +1458,7 @@ class _App:
                 i6pn_enabled=i6pn or (cluster_size is not None),
                 cluster_size=cluster_size,
                 rdma=rdma,
+                fabric_size=fabric_size,
                 include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 restrict_output=False,

modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev0",
+        version: str = "1.5.3.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev0",
+        version: str = "1.5.3.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/functions.pyi

@@ -109,6 +109,7 @@ class Function(
         i6pn_enabled: bool = False,
         cluster_size: typing.Optional[int] = None,
         rdma: typing.Optional[bool] = None,
+        fabric_size: typing.Optional[int] = None,
         single_use_containers: bool = False,
         ephemeral_disk: typing.Optional[int] = None,
         include_source: bool = True,

{modal-1.5.3.dev0.dist-info → modal-1.5.3.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.3.dev0
+Version: 1.5.3.dev2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.3.dev0.dist-info → modal-1.5.3.dev2.dist-info}/RECORD

@@ -6,7 +6,7 @@ modal/_clustered_functions.pyi,sha256=akbff8aXkp5aJapn72YMXPnzeYa6OFAfuakcy7Jx6w
 modal/_container_entrypoint.py,sha256=RoO9tnQVsUfzuqi0QzDkYKt-1YR3qlqEUok_jGhXw2s,22822
 modal/_environments.py,sha256=fpKvtG38NqRiT-4NkBqK1DCZn5LAqPO_vznFIbTCXEE,21016
 modal/_function_variants.py,sha256=ixkwW9naMMBzRB-92BZd5k3iVWtOoYukveT52hLDIbc,12549
-modal/_functions.py,sha256=V8xMSbctRLlxDZzP4jQZHut3RvqwGEIg8bfLaA43iS4,94042
+modal/_functions.py,sha256=aav9lg_LQ-eWwUoN29ai09mLQjtLv0CpnEht2zTlc1o,94280
 modal/_grpc_client.py,sha256=QL5btzOz6zZzTDcgSwFjI3PBy2gkaycyrlP7Jw-jkbY,6962
 modal/_image.py,sha256=TW-0QiFa3Lo1w9khZcE8mgSHQgj-PJ0eChb8IkS2eqo,128738
 modal/_ipython.py,sha256=Bu9fc3hm3xt2O47qLe_d-Mu2jS81LwMsmXNJ1sawBA0,575
@@ -14,7 +14,7 @@ modal/_load_context.py,sha256=wrDqD3KehhFepp0vBhyz_PoLWoRVD0gZHP8dlLHCTiw,4818
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_logs.py,sha256=JI2z_n2ivKrVRd6IIntyUfadNDetm1Wtu00GyGXBuG4,16938
 modal/_object.py,sha256=8YXUBrEEvmx45lK5_nshmOX2xNKtPDXGHPzbiJ1YyAE,13503
-modal/_partial_function.py,sha256=C432UOhSa3fc2dDS_fJhbwMHIRIR1fcMizDhqCyW1qc,34613
+modal/_partial_function.py,sha256=C1E8F9EWfEzOjQr7RbvMIlqNpsI8Na3I1lefkawiHS8,35377
 modal/_resolver.py,sha256=LLDM_84aaJfBdgMZ_50CpXJtQzTw5CNRkbLDOiLZEZ0,5309
 modal/_resources.py,sha256=IS6y7CulfLCjESrpdxFGZr23d5iRCLw6-YQVlE3mKQk,1731
 modal/_serialization.py,sha256=G07UlvH0SPU62twuwgx8MjD49zFX3te-Mg8bwNYfiEU,26594
@@ -25,13 +25,13 @@ modal/_tunnel.pyi,sha256=WVP0dkoN__mM73ZQ-r3nHKCXvYlRMmEWW8iw2xrSY6M,14698
 modal/_type_manager.py,sha256=DWjgmjYJuOagw2erin506UUbG2H5UzZCFEekS-7hmfA,9087
 modal/_watcher.py,sha256=f9kOdHga0TZ6Z6wL7h2O67sz3Oj8pDzjfoAYrNE2hik,3505
 modal/_workspace.py,sha256=5Cyq8xDcBGMHe5dQlwZggrvBq1knISAi4-g8ZGSZ8yM,14836
-modal/app.py,sha256=dw3vJfE_jFnOB4UO585GnY44e8v21SzC8K9rClANjJU,70775
+modal/app.py,sha256=OF0g8hH2vPSpjVKWE7w5_gVil4hUnJbHVfti57Q-FOc,71261
 modal/app.pyi,sha256=pQN8DZnm5rNEyumZ-sfkcGocjn1MSbA9aor7PHb_qQc,85115
 modal/billing.py,sha256=E1-P_P8bJFLp-bTaggYd4BaaViImPB5UdtXiY8VeAZQ,390
 modal/billing.pyi,sha256=4m7VLYNS8IiJ2I3CJx0awvrOM6BILWRVLfdeqtAYr8M,7189
 modal/call_graph.py,sha256=XGALIDn1bLchWo_goyX23bcPjzCZcfqKUo8INIfDapo,1775
 modal/client.py,sha256=OgjptM5UuU5LL85_-DFia-ehS8UCgMzVuzfNcxA1qPA,16136
-modal/client.pyi,sha256=cX3vwvKcW4097CQW9Ie2g9CjIf8Jxv4xDQGJue86v70,17852
+modal/client.pyi,sha256=TGnoJ3BoRPn-pORdwxHg3D5ZQ7_QHvdoPO8mCvyl6oo,17852
 modal/cloud_bucket_mount.py,sha256=03gECcV9l2Lnt9k23YrDOTGFW7ajfXMW5O8b1prhtwQ,6254
 modal/cloud_bucket_mount.pyi,sha256=lMOb44pbNE9kDVEqWfcmvpsnh1sdNNFzuKoVyZZ3d5M,8058
 modal/cls.py,sha256=A4EW0VDrYtQubZJIzGoxnP1wANWD_2PMpU1Q0n8oUhU,40834
@@ -48,7 +48,7 @@ modal/file_io.py,sha256=GYTa67mrmbTTTBsYQnb51VmwGIo0YY-1qQ3YBhagkmA,21795
 modal/file_io.pyi,sha256=3181-DS07flFWLf2BKjqCOiWIjieEOolf33wx6fBp5c,15377
 modal/file_pattern_matcher.py,sha256=6g_awxudMy_ontBvkznybyeNnwGMj297YrmIHCbREI0,8132
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=IQwhfJNOT8A2IKczlyEeqZCV-XQUc83MCC6wV_Pg8rI,47593
+modal/functions.pyi,sha256=fVNoXoSs7GJCoQUCpfWAd50iGdmByH0y62mQYM0DpE8,47643
 modal/image.py,sha256=c0lUSAoU-Ip3g5DGZ0uhdCzoWSQWh1g0i-7Rxo-Sz-I,160
 modal/image.pyi,sha256=Whbfmda2YLAyzctLEF9uF4FQ5b1canwLojSksRJ4gx8,59716
 modal/io_streams.py,sha256=3fhhb7SDJ69pVUu9J3PiMLBePD9bpiIxPN05SCzf8FE,29118
@@ -194,7 +194,7 @@ modal/experimental/flash.py,sha256=GAJ1c-EGL8M3_loAkqr5gdUfySMHY3U_oc6RywfZ8-0,3
 modal/experimental/flash.pyi,sha256=lpTqJFZRMGWscw0xpYZVdBMnAYjj16asXE4_64A6itQ,17774
 modal/experimental/ipython.py,sha256=kJ6o9wkAY_MiSb7paewI7f1MJAeqdi8TX5pBdhr_mUI,2925
 modal/skills/modal/SKILL.md,sha256=WzLjYJ1utjc_ZOf6qZTPwB6wxxwRYB5PibdvIf_FLy0,5316
-modal-1.5.3.dev0.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.5.3.dev2.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=9-b8vl2EsLWD9zJqpCK8IUi5h44Bjn3i3rSdedZV4bA,6415
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -206,8 +206,8 @@ modal_docs/mdmd/signatures.py,sha256=OASroKle763Kfumn4Ek4PABJXEGP56JMCTug44QoBx4
 modal_docs/mdmd/types.py,sha256=MIh5VOnWvFd8T1aZT_vTB2OeLbPB5TASdOaX8jGvpQk,710
 modal_proto/__init__.py,sha256=tFdSv9eaHBvYcwhgq-XqIlYDNDw57clrvO91Fb-oUV4,130
 modal_proto/api_grpc.py,sha256=A8qITFFpfpC7vGee-0TChck4CsuKQMhoUeK3kujcszQ,179126
-modal_proto/api_pb2.py,sha256=Ey03TKVz7MIwUr3VjWEIAgKjzXsuqH0knGu5DaUskB4,486752
-modal_proto/api_pb2.pyi,sha256=6XXF0y_idAh4kPQhx5DnwFP4t3LGWM-BYAY_XxwG8GI,673378
+modal_proto/api_pb2.py,sha256=InjqGNbsfXuy90hsJsNoGFVcmnfDcmnwocuw-RnP_vM,487472
+modal_proto/api_pb2.pyi,sha256=IgGZYgYSojw-Fj8fydD1GeFRsOzZ1FRw7z9qSUD1Mks,675099
 modal_proto/api_pb2_grpc.py,sha256=nq8fa0wvpAZKFWOM6AEdQFgmM3SqGJN6UWKEVeExor4,384710
 modal_proto/api_pb2_grpc.pyi,sha256=SxXg2mPSzMYODtRmE_GPZA4u7qYaa4_jVTahZU5h_pk,89930
 modal_proto/modal_api_grpc.py,sha256=oVMWQ-xpX82WwNl5K0nN9kNS0rfcgTd7hcfqufGu__A,28261
@@ -217,10 +217,10 @@ modal_proto/task_command_router_pb2.py,sha256=LoHxWrzF0EV_gG6SKtAXZbxLUjI-AXzCIG
 modal_proto/task_command_router_pb2.pyi,sha256=mT-KTIZlLJ5Hd0mXSxyXw84pt_7tV__hd5TpHJ4OHh4,44044
 modal_proto/task_command_router_pb2_grpc.py,sha256=bX22HJ8qEqKl5YkP00-EPE83rZUdqmk0FDZjtpb21-U,40487
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=DnkJ4U5hq6wp7XkLyE9xELNqSmNwA_vgawTiS_fVBK0,13241
-modal_version/__init__.py,sha256=7INd8JFwae4Gt5M_ZlTv0dwZzIdBY5Fs3y_am3BNXbY,120
+modal_version/__init__.py,sha256=0bxB0DrvR3i4nk6WAxNy7MXXkcQsVIQjgDKtlq8RanA,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.5.3.dev0.dist-info/METADATA,sha256=j-S1_F1yd9bmquNzFdPoL945fIkEQC3sbxG6gO8lFbY,2512
-modal-1.5.3.dev0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.5.3.dev0.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.5.3.dev0.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.5.3.dev0.dist-info/RECORD,,
+modal-1.5.3.dev2.dist-info/METADATA,sha256=Io_zAgMXDC-K_dNiDl2q0puMwD0ijM2JmXNYBFCzu3o,2512
+modal-1.5.3.dev2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.5.3.dev2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.5.3.dev2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.5.3.dev2.dist-info/RECORD,,