xoscar 0.6.0__cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.6.2__cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

xoscar/backends/indigen/pool.py

@@ -134,6 +134,31 @@ class SubpoolStatus:
     traceback: TracebackType | None = None
 
 
+_PRE_SET_ENV_LOCK = asyncio.Lock()
+
+
+@contextlib.asynccontextmanager
+async def _pre_set_env_in_main(env: dict[str, str]):
+    # Normally, `env` is set in sub pool,
+    # but something may have happened during initialization,
+    # e.g. CUDA_VISIBLE_DEVICES is too late to set when some actions may have polluted cuda
+    # we have to set environ before new process started
+    # enable this only when XOSCAR_PRE_SET_ENV=1
+    enable_pre_set_env = bool(int(os.getenv("XOSCAR_PRE_SET_ENV", 0)))
+    if not enable_pre_set_env or not env:
+        yield
+        return
+
+    global_environ = os.environ.copy()
+    async with _PRE_SET_ENV_LOCK:
+        try:
+            logger.debug("Updating environment variables in main: %s", env)
+            os.environ.update(env)
+            yield
+        finally:
+            os.environ = global_environ  # type: ignore
+
+
 @_register_message_handler
 class MainActorPool(MainActorPoolBase):
     @classmethod
@@ -223,9 +248,12 @@ class MainActorPool(MainActorPoolBase):
 
         _patch_spawn_get_preparation_data()
         loop = asyncio.get_running_loop()
-        with futures.ThreadPoolExecutor(1) as executor:
-            create_pool_task = loop.run_in_executor(executor, start_pool_in_process)
-            return await create_pool_task
+        async with _pre_set_env_in_main(
+            actor_pool_config.get_pool_config(process_index)["env"]
+        ):
+            with futures.ThreadPoolExecutor(1) as executor:
+                create_pool_task = loop.run_in_executor(executor, start_pool_in_process)
+                return await create_pool_task
 
     @classmethod
     async def wait_sub_pools_ready(cls, create_pool_tasks: List[asyncio.Task]):
@@ -394,9 +422,10 @@ class MainActorPool(MainActorPoolBase):
             return process, process_status
 
         loop = asyncio.get_running_loop()
-        with futures.ThreadPoolExecutor(1) as executor:
-            create_pool_task = loop.run_in_executor(executor, start_pool_in_process)
-            process, process_status = await create_pool_task
+        async with _pre_set_env_in_main(env):  # type: ignore
+            with futures.ThreadPoolExecutor(1) as executor:
+                create_pool_task = loop.run_in_executor(executor, start_pool_in_process)
+                process, process_status = await create_pool_task
 
         self._config.reset_pool_external_address(
             process_index, process_status.external_addresses[0]

xoscar/virtualenv/uv.py

@@ -58,19 +58,13 @@ class UVVirtualEnvManager(VirtualEnvManager):
         if "trusted_host" in kwargs and kwargs["trusted_host"]:
             cmd += ["--trusted-host", kwargs["trusted_host"]]
 
-        self._install_process = subprocess.Popen(
-            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-
-        stdout, stderr = self._install_process.communicate()
-        returncode = self._install_process.returncode
+        self._install_process = process = subprocess.Popen(cmd)
+        returncode = process.wait()
 
         self._install_process = None  # install finished, clear reference
 
         if returncode != 0:
-            raise subprocess.CalledProcessError(
-                returncode, cmd, output=stdout, stderr=stderr
-            )
+            raise subprocess.CalledProcessError(returncode, cmd)
 
     def cancel_install(self):
         if self._install_process and self._install_process.poll() is None:

{xoscar-0.6.0.dist-info → xoscar-0.6.2.dist-info}/METADATA

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

{xoscar-0.6.0.dist-info → xoscar-0.6.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xoscar-0.6.0.dist-info/WHEEL,sha256=odWhGiW78xn3o-6XlxWIPYOVfFPS2CRR8nn187EmA10,153
-xoscar-0.6.0.dist-info/RECORD,,
-xoscar-0.6.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.6.0.dist-info/METADATA,sha256=xRi_7864BdBxjqs8TCKOTzsQjIqUUL_GLfoICD9MySw,9131
+xoscar-0.6.2.dist-info/WHEEL,sha256=uQhwWuoFf1gIcqVl7-ms4dgK6ADZycAosqNbzc_UxKc,153
+xoscar-0.6.2.dist-info/RECORD,,
+xoscar-0.6.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.6.2.dist-info/METADATA,sha256=wovBXhCiwv2yIjh04jbMYRBrA9ZQpBtml6gVCW7YSTs,9131
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
@@ -54,11 +54,11 @@ xoscar/backends/test/pool.py,sha256=TW4X6J-92Pti66103poQBNDBznX6CBD3RLOc_zixjTo,
 xoscar/backends/test/__init__.py,sha256=j2ZfD6prD9WjUxRUDC7Eq5Z7N7TkL6fFr59oNyc_vY4,682
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952
-xoscar/backends/indigen/pool.py,sha256=v0Ps79W0WyeFSt2YxCJnh7q_1dnRQmo9887gcW3pNoc,17226
+xoscar/backends/indigen/pool.py,sha256=eeT29MDwou7UQrfY9B9Z7iY6TI7DlWvrZxg0euz96eA,18287
 xoscar/backends/indigen/__init__.py,sha256=tKHP5ClzedBRBpZsLRVErR3EUNbbDm4CY4u0rCFJr44,685
 xoscar/virtualenv/core.py,sha256=YMN6yHoNeEc8ecbJMbZkKeWKUABK1mUZ_OYOjcbRqWs,1263
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
-xoscar/virtualenv/uv.py,sha256=wP0wVgWkncABpXnNRVPuOPaeIP7fy3c0LRVrKBFtqU8,3042
+xoscar/virtualenv/uv.py,sha256=l9w5JxETbW2wN8vfZR7k7aKTz4cWV4MvH06MoogBOVc,2842
 xoscar/metrics/api.py,sha256=BBlMIFvVAGVfrtpeJ1YlH9Tqhy9OzGavwvGyeHcQ0Tk,8856
 xoscar/metrics/__init__.py,sha256=9Badi7rxYikGm2dQiNCrj9GgMRBxwuR3JaEKcFZmfak,705
 xoscar/metrics/backends/metric.py,sha256=aPhyc8JgH22L3rcHP8IjsmgrhSODjg6B5TZVnre97y8,4446

{xoscar-0.6.0.dist-info → xoscar-0.6.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-manylinux_2_17_aarch64
 Tag: cp312-cp312-manylinux2014_aarch64