xoscar 0.7.7__tar.gz → 0.7.9__tar.gz

{xoscar-0.7.7 → xoscar-0.7.9}/PKG-INFO

@@ -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 → xoscar-0.7.9}/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-0.7.7 → xoscar-0.7.9}/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 → xoscar-0.7.9}/xoscar.egg-info/PKG-INFO

@@ -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