xoscar 0.7.2__tar.gz → 0.7.4__tar.gz

{xoscar-0.7.2 → xoscar-0.7.4}/PKG-INFO

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

{xoscar-0.7.2 → xoscar-0.7.4}/xoscar/backends/indigen/pool.py

@@ -278,14 +278,16 @@ class MainActorPool(MainActorPoolBase):
                     "main_pool_pid": os.getpid(),
                 },
             )
-            process = await create_subprocess_exec(
+            cmd = [
                 start_python,
                 "-m",
                 "xoscar.backends.indigen",
                 "start_sub_pool",
                 "-sn",
                 shm.name,
-            )
+            ]
+            logger.info("Creating sub pool via command: %s", cmd)
+            process = await create_subprocess_exec(*cmd)
 
             def _get_external_addresses():
                 try:
@@ -316,7 +318,7 @@ class MainActorPool(MainActorPoolBase):
             shm.close()
             shm.unlink()
         if external_addresses is None:
-            raise OSError("Start sub pool failed.")
+            raise OSError(f"Start sub pool failed, returncode: {process.returncode}")
         return process, external_addresses
 
     async def append_sub_pool(

{xoscar-0.7.2 → xoscar-0.7.4}/xoscar/virtualenv/uv.py

@@ -14,14 +14,24 @@
 
 from __future__ import annotations
 
+import logging
+import os
 import shutil
 import subprocess
+import sys
 import sysconfig
 from pathlib import Path
 from typing import Optional
 
 from .core import VirtualEnvManager
 
+UV_PATH = os.getenv("XOSCAR_UV_PATH")
+logger = logging.getLogger(__name__)
+
+
+def _is_in_pyinstaller():
+    return hasattr(sys, "_MEIPASS")
+
 
 class UVVirtualEnvManager(VirtualEnvManager):
     def __init__(self, env_path: Path):
@@ -30,12 +40,23 @@ class UVVirtualEnvManager(VirtualEnvManager):
 
     @classmethod
     def is_available(cls):
+        if UV_PATH is not None:
+            # user specified uv, just treat it as existed
+            return True
         return shutil.which("uv") is not None
 
     def create_env(self, python_path: Path | None = None) -> None:
-        cmd = ["uv", "venv", str(self.env_path), "--system-site-packages"]
+        uv_path = UV_PATH or "uv"
+        cmd = [uv_path, "venv", str(self.env_path), "--system-site-packages"]
         if python_path:
             cmd += ["--python", str(python_path)]
+        elif _is_in_pyinstaller():
+            # in pyinstaller, uv would find the system python
+            # in this case we'd better specify the same python version
+            python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+            cmd += ["--python", python_version]
+
+        logger.info("Creating virtualenv via command: %s", cmd)
         subprocess.run(cmd, check=True)
 
     def install_packages(self, packages: list[str], **kwargs):
@@ -50,7 +71,8 @@ class UVVirtualEnvManager(VirtualEnvManager):
         # maybe replace #system_torch# to the real version
         packages = self.process_packages(packages)
 
-        cmd = ["uv", "pip", "install", "-p", str(self.env_path)] + packages
+        uv_path = UV_PATH or "uv"
+        cmd = [uv_path, "pip", "install", "-p", str(self.env_path)] + packages
 
         # Handle known pip-related kwargs
         if "index_url" in kwargs and kwargs["index_url"]:
@@ -69,6 +91,7 @@ class UVVirtualEnvManager(VirtualEnvManager):
                 else:
                     cmd += [option, param_value]
 
+        logger.info("Installing packages via command: %s", cmd)
         self._install_process = process = subprocess.Popen(cmd)
         returncode = process.wait()
 

{xoscar-0.7.2 → xoscar-0.7.4}/xoscar.egg-info/PKG-INFO

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