xoscar 0.7.2__cp311-cp311-macosx_10_9_x86_64.whl → 0.7.4__cp311-cp311-macosx_10_9_x86_64.whl

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/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.dist-info → xoscar-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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.dist-info → xoscar-0.7.4.dist-info}/RECORD

@@ -1,9 +1,5 @@
-xoscar-0.7.2.dist-info/RECORD,,
-xoscar-0.7.2.dist-info/WHEEL,sha256=9JW_xs4qhQPk0BxaQRvBEJlozFusVYXbUecyREdMua0,138
-xoscar-0.7.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.2.dist-info/METADATA,sha256=kycUtCi7lCcrW_pSYGtGWuB1ZFRGxkF2Ew7BmrP24Xk,9134
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
-xoscar/_utils.cpython-311-darwin.so,sha256=uoOZLuKAs5m6Dau1ZDqSNzt2ZuI4oPeeogo5QykEjDE,162536
+xoscar/_utils.cpython-311-darwin.so,sha256=BmabxOGyjhBLm_MqFpfZQdNe6Y_jUKFMe_7Logbh0X0,162536
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -14,11 +10,11 @@ xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
 xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
 xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
 xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
-xoscar/context.cpython-311-darwin.so,sha256=LjOCr7Vbd18X_PcDCjHrvRxo9mUV0Q5uD9eAV1EROrM,201296
+xoscar/context.cpython-311-darwin.so,sha256=RL7UCruwfBism1R6y8sI-KkG8UmrbYlxe8qp3nCn7uU,201296
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
 xoscar/libcpp.pxd,sha256=DJqBxLFOKL4iRr9Kale5UH3rbvPRD1x5bTSOPHFpz9I,1147
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
-xoscar/core.cpython-311-darwin.so,sha256=vUyqjEebn-Vukw8Vr_R-aXymHwZdTWZEh9gGPZCNDJc,416048
+xoscar/core.cpython-311-darwin.so,sha256=e57w1pgf7G25v70g_eSjwYqos1L6q9QQEAFiVYX5QN4,416048
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
@@ -46,10 +42,10 @@ xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/serialization/aio.py,sha256=5DySPgDxU43ec7_5Ct44-Oqt7YNSJBfuf8VdQgQlChA,4731
-xoscar/serialization/core.cpython-311-darwin.so,sha256=PVIsENVpnAHZJVjKgV2OwK2YILzSqbj5SxSWhfoq-BA,393856
+xoscar/serialization/core.cpython-311-darwin.so,sha256=egOXpH8AN_qJud81pN-X7cAPRzYp5HzqZ7lPXN8PhKw,393856
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
 xoscar/serialization/mlx.py,sha256=N_cvbTUBKc14XWYsPIMz4kDstyRN1DNhb4BVRgnQm8Y,1872
-xoscar/backends/message.cpython-311-darwin.so,sha256=kKBNkVvUocPfWBI7WAwVuFzjtzKzA_Nqu2Mm_q2C7QY,374144
+xoscar/backends/message.cpython-311-darwin.so,sha256=_I9U_tBX3VjTDRjfIY9N8vGSvzajWbTU04_twYIkTrg,374144
 xoscar/backends/config.py,sha256=4tZMiXAMMS8qQ4SX_LjONLtSQVfZTx3m-IK3EqbkYdk,5375
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643
@@ -63,7 +59,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=7-a_T2D_gG9MhhfkaNj2QGy7FjK06n2xwyD9Tw-rfqc,15732
+xoscar/backends/indigen/pool.py,sha256=lzX_bJ07kvUurseZBr1WPL71USBcva62Xo_C6kgo5_g,15857
 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
@@ -83,4 +79,8 @@ xoscar/aio/parallelism.py,sha256=VSsjk8wP-Bw7tLeUsTyLVNgp91thjxEfE3pCrw_vF5Q,129
 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/uv.py,sha256=_A32kMVtTolw8wb0rFQONbw_pAFJgNVMJo1s1WkqFrc,3329
+xoscar/virtualenv/uv.py,sha256=mR4gevfB8eFMmSLfvOYM-QhyqWyDsqO-V4bkRuhOOWA,4145
+xoscar-0.7.4.dist-info/RECORD,,
+xoscar-0.7.4.dist-info/WHEEL,sha256=9JW_xs4qhQPk0BxaQRvBEJlozFusVYXbUecyREdMua0,138
+xoscar-0.7.4.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.4.dist-info/METADATA,sha256=Er_dlAOGng8Du9y2bXQt42CAe9IG8nOTMjOgzGHVMyo,9134