xoscar 0.7.7__cp312-cp312-macosx_10_13_x86_64.whl → 0.7.9__cp312-cp312-macosx_10_13_x86_64.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.4
 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,7 +1,7 @@
-xoscar-0.7.7.dist-info/RECORD,,
-xoscar-0.7.7.dist-info/WHEEL,sha256=mer8vOuI-KlBtJIdzgyZALHdls6RZGRaE6RPt7dfKrk,138
-xoscar-0.7.7.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.7.dist-info/METADATA,sha256=VlR6_DfFF_NtnZ-py4anndgzf2J9RcSuOHGWJkuVil0,9189
+xoscar-0.7.9.dist-info/RECORD,,
+xoscar-0.7.9.dist-info/WHEEL,sha256=mer8vOuI-KlBtJIdzgyZALHdls6RZGRaE6RPt7dfKrk,138
+xoscar-0.7.9.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.9.dist-info/METADATA,sha256=XaSfuO4rN2a2-jVjgwvmazav7fByEiPpqdC7SRmFkS4,9189
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
@@ -10,16 +10,16 @@ xoscar/context.pxd,sha256=qKa0OyDPZtVymftSh447m-RzFZgmz8rGqQBa7qlauvc,725
 xoscar/batch.py,sha256=DpArS0L3WYJ_HVPG-6hSYEwoAFY1mY2-mlC4Jp5M_Dw,7872
 xoscar/nvutils.py,sha256=qmW4mKLU0WB2yCs198ccQOgLL02zB7Fsa-AotO3NOmg,20412
 xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
-xoscar/core.cpython-312-darwin.so,sha256=PAlbW9e3OR5wpP5ai2oPnhCvTAYR1nfmYzLf0jcf5jc,419368
+xoscar/core.cpython-312-darwin.so,sha256=5iJqZ3uHFsZOlTINbFeIPEklM9Kl474u5ERHxY9dq_4,419776
 xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
-xoscar/context.cpython-312-darwin.so,sha256=486YlWxc3jU-7SBBEsIAAjw2ZfaNLqGUsm5gpuvoR1c,200656
+xoscar/context.cpython-312-darwin.so,sha256=tLw4wmpAPxToSQiTzwysZ7edFJQRod-TygX-0ntKf7A,201064
 xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
 xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
 xoscar/libcpp.pxd,sha256=DJqBxLFOKL4iRr9Kale5UH3rbvPRD1x5bTSOPHFpz9I,1147
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
-xoscar/_utils.cpython-312-darwin.so,sha256=xCxt0G7V4mva-ZdhJBlNiWjyRJD48GhXQ27f7sL3U_s,154728
+xoscar/_utils.cpython-312-darwin.so,sha256=psv7dQffUOj_KTy8AeoamHiXD2eXM84JUQ3H9Q6Yqm8,155456
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
 xoscar/profiling.py,sha256=BC5OF0HzSaXv8V7w-y-B8r5gV5DgxHFoTEIF6jCMioQ,8015
@@ -43,7 +43,7 @@ xoscar/serialization/exception.py,sha256=Jy8Lsk0z-VJyEUaWeuZIwkmxqaoB-nLKMa1D15C
 xoscar/serialization/pyfury.py,sha256=sifOnVMYoS82PzZEkzkfxesmMHei23k5UAUUKUyoOYQ,1163
 xoscar/serialization/core.pxd,sha256=k4RoJgX5E5LGs4jdCQ7vvcn26MabXbrWoWhkO49X6YI,985
 xoscar/serialization/core.pyi,sha256=-pQARSj91rt3iU4ftWGFH6jYwsSKYCT_Ya7EJsaGEjg,1874
-xoscar/serialization/core.cpython-312-darwin.so,sha256=h1SqjOL3RPsF0pV7kkOdk51bBNft48lOx0qXTwSqdzE,391208
+xoscar/serialization/core.cpython-312-darwin.so,sha256=9Du0wkt-8lbFaWW-wZmj8UdroAOwD-_EuhtmVgbK-rI,391616
 xoscar/serialization/__init__.py,sha256=v76XC2OQLp-Yk4_U3_IVguEylMeyRw1UrkU_DPDMh0U,856
 xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0,2919
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
@@ -58,7 +58,7 @@ xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,6
 xoscar/backends/core.py,sha256=EH-fHlV9x3bnruEHaUtGYO7osKLfLJ4AQHtuzA_mr2g,10857
 xoscar/backends/context.py,sha256=XfDPG2eDhAhE6hWBEkEsHTnyyOYN9R3houlMjAL7BFw,16329
 xoscar/backends/router.py,sha256=MVl5naz-FYf-Wla7XRn3kRxOpWV0SjKDsKNluifVA8M,10532
-xoscar/backends/message.cpython-312-darwin.so,sha256=HZ7HNVn9RbpMWK28OixnmQuhOASBYHjufP94UAkh9iE,375536
+xoscar/backends/message.cpython-312-darwin.so,sha256=wEjPU5WiSreEZ5GCWF0FKF7K1xhIAo-qW2UAQBvVpiQ,376104
 xoscar/backends/message.pyx,sha256=krGVtZ1YDaZX8yWhaNHwZiudQooLvcGlw6x3Sq7jxjE,19685
 xoscar/backends/pool.py,sha256=nrh8qobaukkjUOOOTR9t90i-wbXlgma3TNRjvwkwmcg,60528
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
@@ -66,7 +66,7 @@ xoscar/backends/indigen/shared_memory.py,sha256=wqbckbgnd0qNm5KzlP_hklF3F_n8fKnC
 xoscar/backends/indigen/__init__.py,sha256=tKHP5ClzedBRBpZsLRVErR3EUNbbDm4CY4u0rCFJr44,685
 xoscar/backends/indigen/fate_sharing.py,sha256=3QUHwq5Cjk9oCKFUISvkqHaoxWZIaXcq8JNOetdBl-A,8655
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952
-xoscar/backends/indigen/pool.py,sha256=uL-tL9uG7HdXIJ8usQOauiqvr2_a0ztMVB2FnLzjdnM,16173
+xoscar/backends/indigen/pool.py,sha256=t8zQ1i6Kf3JEy8EMMX7vTbKakilkn4TuxPdsxaxh27A,16573
 xoscar/backends/indigen/__main__.py,sha256=-pfio-Y4Ogbk6lBFksH-gRatp-N6sZ7wuNc-i2YsLJc,510
 xoscar/backends/test/backend.py,sha256=nv9WFhH5Bbq4Q1HB9yfpciZBaeHT4IQAtzugBWESrUY,1263
 xoscar/backends/test/__init__.py,sha256=j2ZfD6prD9WjUxRUDC7Eq5Z7N7TkL6fFr59oNyc_vY4,682
@@ -85,6 +85,6 @@ xoscar/aio/lru.py,sha256=rpXCqSLtPV5xnWtd6uDwQQFGgIPEgvmWEQDkPNUx9cM,6311
 xoscar/aio/parallelism.py,sha256=VSsjk8wP-Bw7tLeUsTyLVNgp91thjxEfE3pCrw_vF5Q,1293
 xoscar/aio/base.py,sha256=9j0f1piwfE5R5GIvV212vSD03ixdaeSzSSsO2kxJZVE,2249
 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