xoscar 0.7.7__cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.7.9__cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

xoscar/backends/indigen/pool.py

@@ -63,8 +63,8 @@ def _shm_put_object(seq: _ShmSeq, shm: shared_memory.SharedMemory, o: object):
     assert (
         len(serialized) < _SUBPROCESS_SHM_SIZE - 8
     ), f"Serialized object {o} is too long."
-    shm.buf[4:12] = struct.pack("<II", sys.hexversion, len(serialized))
-    shm.buf[12 : 12 + len(serialized)] = serialized
+    shm.buf[4:8] = struct.pack("<I", len(serialized))
+    shm.buf[8 : 8 + len(serialized)] = serialized
     shm.buf[:4] = struct.pack("<I", seq)
 
 
@@ -72,12 +72,8 @@ def _shm_get_object(seq: _ShmSeq, shm: shared_memory.SharedMemory):
     recv_seq = struct.unpack("<I", shm.buf[:4])[0]
     if recv_seq != seq:
         return
-    python_version_hex, size = struct.unpack("<II", shm.buf[4:12])
-    if python_version_hex != sys.hexversion:
-        raise RuntimeError(
-            f"Python version mismatch, sender: {python_version_hex}, receiver: {sys.hexversion}"
-        )
-    return pickle.loads(shm.buf[12 : 12 + size])
+    size = struct.unpack("<I", shm.buf[4:8])[0]
+    return pickle.loads(shm.buf[8 : 8 + size])
 
 
 @_register_message_handler
@@ -175,6 +171,16 @@ class MainActorPool(MainActorPoolBase):
         shm = shared_memory.SharedMemory(shm_name, track=False)
         try:
             config = _shm_get_object(_ShmSeq.INIT_PARAMS, shm)
+            # Check Python version once.
+            sub_pool_python_version = config.pop("python_version", None)
+            if (
+                sub_pool_python_version is not None
+                and sub_pool_python_version != sys.hexversion
+            ):
+                logger.warning(
+                    f"The sub pool is using a different Python version, you may encounter serialization issues."
+                    f" sub pool: {sub_pool_python_version}, main pool: {sys.hexversion}"
+                )
             actor_config = config["actor_pool_config"]
             process_index = config["process_index"]
             main_pool_pid = config["main_pool_pid"]
@@ -276,6 +282,7 @@ class MainActorPool(MainActorPoolBase):
                     "actor_pool_config": actor_pool_config,
                     "process_index": process_index,
                     "main_pool_pid": os.getpid(),
+                    "python_version": sys.hexversion,
                 },
             )
             cmd = [
@@ -423,7 +430,9 @@ class MainActorPool(MainActorPoolBase):
             except psutil.TimeoutExpired:
                 pass
 
-        while p.is_running():
+        count = 0
+        while p.is_running() and count < 3:
+            count += 1
             p.kill()
             if not p.is_running():
                 return

xoscar/virtualenv/core.py

@@ -63,6 +63,8 @@ class VirtualEnvManager(ABC):
                 ]  # Extract actual package name, e.g., "torch"
                 try:
                     version = importlib.metadata.version(real_pkg)
+                    # Strip build metadata like "+cpu"
+                    version = version.split("+")[0]
                 except importlib.metadata.PackageNotFoundError:
                     raise RuntimeError(
                         f"System package '{real_pkg}' not found. Cannot resolve '{pkg}'."

{xoscar-0.7.7.dist-info → xoscar-0.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.7.7
+Version: 0.7.9
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye

{xoscar-0.7.7.dist-info → xoscar-0.7.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
-xoscar/_utils.cpython-311-aarch64-linux-gnu.so,sha256=lpD12EcSLrdJdMH7IOax-eorwmSIaq9gjhKND0MkScc,1209320
+xoscar/_utils.cpython-311-aarch64-linux-gnu.so,sha256=tLyc7SxmaIpZKbZgWpKRnZ8sFbofNKZawFXmTtidC-w,1212920
 xoscar/_utils.pxd,sha256=5KYAL3jfPdejsHnrGGT2s--ZUX5SXznQWpHVSno429k,1157
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -7,10 +7,10 @@ xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/batch.py,sha256=DpArS0L3WYJ_HVPG-6hSYEwoAFY1mY2-mlC4Jp5M_Dw,7872
 xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
-xoscar/context.cpython-311-aarch64-linux-gnu.so,sha256=q3W4mrElbcfeRTDOh1skdrL1ThWC0_fQmvh5aEbEZ98,1603800
+xoscar/context.cpython-311-aarch64-linux-gnu.so,sha256=jRRoZ_ujryr39hVAOjV9TC9ga4BqVMHLZaBi7KWmYWo,1607144
 xoscar/context.pxd,sha256=qKa0OyDPZtVymftSh447m-RzFZgmz8rGqQBa7qlauvc,725
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
-xoscar/core.cpython-311-aarch64-linux-gnu.so,sha256=mNMsJkdOg_RwUxTPmCyEbeE-qRsjm9-uIfKrYwnaBBc,3884496
+xoscar/core.cpython-311-aarch64-linux-gnu.so,sha256=0ZkOBUI-yXAT4v3fuY7jOP_MQxuOknQitQpLcrgwoco,3887928
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
@@ -30,7 +30,7 @@ xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY
 xoscar/backends/config.py,sha256=4tZMiXAMMS8qQ4SX_LjONLtSQVfZTx3m-IK3EqbkYdk,5375
 xoscar/backends/context.py,sha256=XfDPG2eDhAhE6hWBEkEsHTnyyOYN9R3houlMjAL7BFw,16329
 xoscar/backends/core.py,sha256=EH-fHlV9x3bnruEHaUtGYO7osKLfLJ4AQHtuzA_mr2g,10857
-xoscar/backends/message.cpython-311-aarch64-linux-gnu.so,sha256=w9cf1-OJRISAg_u8WPB6SQ0NvqGGPbmRFg3mtRHeyjU,3907176
+xoscar/backends/message.cpython-311-aarch64-linux-gnu.so,sha256=xbwEyLvBMWzscbNs0yiw87aMmOJOornjOxc4061YsXE,3910208
 xoscar/backends/message.pyx,sha256=krGVtZ1YDaZX8yWhaNHwZiudQooLvcGlw6x3Sq7jxjE,19685
 xoscar/backends/pool.py,sha256=nrh8qobaukkjUOOOTR9t90i-wbXlgma3TNRjvwkwmcg,60528
 xoscar/backends/router.py,sha256=MVl5naz-FYf-Wla7XRn3kRxOpWV0SjKDsKNluifVA8M,10532
@@ -47,7 +47,7 @@ xoscar/backends/indigen/__main__.py,sha256=-pfio-Y4Ogbk6lBFksH-gRatp-N6sZ7wuNc-i
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952
 xoscar/backends/indigen/fate_sharing.py,sha256=3QUHwq5Cjk9oCKFUISvkqHaoxWZIaXcq8JNOetdBl-A,8655
-xoscar/backends/indigen/pool.py,sha256=uL-tL9uG7HdXIJ8usQOauiqvr2_a0ztMVB2FnLzjdnM,16173
+xoscar/backends/indigen/pool.py,sha256=t8zQ1i6Kf3JEy8EMMX7vTbKakilkn4TuxPdsxaxh27A,16573
 xoscar/backends/indigen/shared_memory.py,sha256=wqbckbgnd0qNm5KzlP_hklF3F_n8fKnCehSox5uMwNs,19082
 xoscar/backends/test/__init__.py,sha256=j2ZfD6prD9WjUxRUDC7Eq5Z7N7TkL6fFr59oNyc_vY4,682
 xoscar/backends/test/backend.py,sha256=nv9WFhH5Bbq4Q1HB9yfpciZBaeHT4IQAtzugBWESrUY,1263
@@ -68,7 +68,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=MxoMvVrg0pOkKpkjJ0PcAuEaaEJR2FZljmPrLjQ1-oc,2050
 xoscar/serialization/__init__.py,sha256=v76XC2OQLp-Yk4_U3_IVguEylMeyRw1UrkU_DPDMh0U,856
 xoscar/serialization/aio.py,sha256=5DySPgDxU43ec7_5Ct44-Oqt7YNSJBfuf8VdQgQlChA,4731
-xoscar/serialization/core.cpython-311-aarch64-linux-gnu.so,sha256=9htNDl0dGpzZTWRLVzcfvzu-oeYmYsCcBLuW_MYG5n8,3874904
+xoscar/serialization/core.cpython-311-aarch64-linux-gnu.so,sha256=uoEFFqwdN-cz5F3052P7I5bC3lOARAOBaSopB5A9T-0,3878240
 xoscar/serialization/core.pxd,sha256=k4RoJgX5E5LGs4jdCQ7vvcn26MabXbrWoWhkO49X6YI,985
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
@@ -78,10 +78,10 @@ xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0
 xoscar/serialization/pyfury.py,sha256=sifOnVMYoS82PzZEkzkfxesmMHei23k5UAUUKUyoOYQ,1163
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
-xoscar/virtualenv/core.py,sha256=dZqwg2IzHsLEERvohZx0rvBINopMRUImqxG3HHGO0q4,2744
+xoscar/virtualenv/core.py,sha256=qHKqI6R92SN0_OWVAX1xy9wJiZr-r0VfLHTskZtZE4U,2851
 xoscar/virtualenv/utils.py,sha256=mL_uATHhj82xec0-0IZ6N8yI-laPAB4t8G3alPUGtPA,2439
 xoscar/virtualenv/uv.py,sha256=XCjeCEntMhA0kyZS0qG7qu9AWzPtIwdeTJRLYRIOiDI,4788
-xoscar-0.7.7.dist-info/METADATA,sha256=xxkpDn2341sKmMMKzwq2RdvcuBA8N5hSCDwphsv5qcU,9134
-xoscar-0.7.7.dist-info/WHEEL,sha256=SqeGUsDS88JbDMFEmg5kozXLxkaYruG6PG7xezonLcQ,154
-xoscar-0.7.7.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.7.dist-info/RECORD,,
+xoscar-0.7.9.dist-info/METADATA,sha256=af3hRvcba-yfLchiCmdJCPCYIt8lvXOsFNrWA2Tf_1s,9134
+xoscar-0.7.9.dist-info/WHEEL,sha256=SqeGUsDS88JbDMFEmg5kozXLxkaYruG6PG7xezonLcQ,154
+xoscar-0.7.9.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.9.dist-info/RECORD,,