xoscar 0.6.1__cp39-cp39-win_amd64.whl → 0.6.2__cp39-cp39-win_amd64.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-0.6.1.dist-info → xoscar-0.6.2.dist-info}/METADATA

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

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

@@ -1,5 +1,5 @@
 xoscar/__init__.py,sha256=dlwtB7dnDp5WME6CZVQY7d9lk1yJ9s___H5UxjGlAd4,1668
-xoscar/_utils.cp39-win_amd64.pyd,sha256=ytFpzTkxz_hlcOXyu1W4vausTvV_2LH8GlS2EPgXQk8,118272
+xoscar/_utils.cp39-win_amd64.pyd,sha256=-3_aia1olmpRp3KbBXOwSB5x0DXccYTIRzXGXw4JrSI,118272
 xoscar/_utils.pxd,sha256=rlNbTg5lhXA-jCOLksqF4jhUlNn0xw2jx1HxdLa34pc,1193
 xoscar/_utils.pyx,sha256=18MUutw6M8Het9FcnrDMjexiJ3zxYljpTNRiYKGD-Jw,7524
 xoscar/_version.py,sha256=bsfCVAo_o9LkiP3AjPsP4SRRqhjuS0t4D1WGJPzbdls,24412
@@ -7,10 +7,10 @@ xoscar/api.py,sha256=B5oXv4vgMxMteh1YNaBmNFDrUFmYa_dCdzfaWwwZnCo,13820
 xoscar/backend.py,sha256=8G5JwjoOT6Q2slb11eXNApxgcmvNQUCdQzkoIMDwLcQ,1917
 xoscar/batch.py,sha256=Jk5BSpvMFAV9DrRy0a9tgPvIo_dt8cbJReZBL0cnOPc,8128
 xoscar/constants.py,sha256=GJ1KEOxwnqksc9K_GH42TSWpQECeC6ti3KJmE3PUcTw,810
-xoscar/context.cp39-win_amd64.pyd,sha256=JBKo0rZNBSZobajE8z9DMFFzRaMurZQUbusmIq9NDi4,159232
+xoscar/context.cp39-win_amd64.pyd,sha256=DWNmgyqG8zrpNmTS7vjnfbRMhnyfR4leBV7mxaDi_So,159232
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp39-win_amd64.pyd,sha256=p0CxpsJbdJDTazvcI4y45BnapCcLanpQ_Rw5rOcVvxk,337920
+xoscar/core.cp39-win_amd64.pyd,sha256=A16cW6Un8y9x1n80sO3vzx6by0ZOFtDltaBOXU1cnn4,337920
 xoscar/core.pxd,sha256=9IZP7dYGfnF1I-obIls8R8b6forxDOPbiM3v5nVslLk,1368
 xoscar/core.pyx,sha256=U6jCZN74MQHi7HkQRaVGm_w5q-FMsw0nnE3aU6533_Q,22756
 xoscar/debug.py,sha256=hrmxIH6zvTKasQo6PUUgXu5mgEsR0g87Fvpw7CoHipg,5257
@@ -30,7 +30,7 @@ xoscar/backends/allocate_strategy.py,sha256=DzvTlixwzTANURI2mDLHm3vcaugSPDxU6UQZ
 xoscar/backends/config.py,sha256=86j0g_Xrl8ENPzBWi296yWg9QEcljvdKK-yJbfYTvQ0,5532
 xoscar/backends/context.py,sha256=qWwksx8JxYcKR-LQA3PvXh4ReuuTTEyDaLbjpxGXcTA,16766
 xoscar/backends/core.py,sha256=fbekAxys_t1Dv7if-1R6uVvC_yAxNkXLeQ1V1ZSAfC0,11161
-xoscar/backends/message.cp39-win_amd64.pyd,sha256=RKtn6H5pwS15ACjwganUQwO__VuKTD6DHBAVRx6cqjA,284672
+xoscar/backends/message.cp39-win_amd64.pyd,sha256=5jvnPzzoDmqTufSsVQwlCaBmTDjwOAg-tjbMaEwwspk,284672
 xoscar/backends/message.pyx,sha256=lBEjMJv4VyxmeO9lHXJJazOajbFnTLak4PSBcLoPZvU,20331
 xoscar/backends/pool.py,sha256=XFij5l9FCbMC1isXp4tpr6YsZVxf4GfpIRfwn-nhCGE,62638
 xoscar/backends/router.py,sha256=EjfNpQUrhFU15eYe1kRPueziHgI2gfDViUzm7ruvXDE,10817
@@ -45,7 +45,7 @@ xoscar/backends/communication/utils.py,sha256=F-muF5_ow9JzAPAZ3d8XaGDiz3bRZOdWmW
 xoscar/backends/indigen/__init__.py,sha256=Khr2aGbaIw_04NIdY7QNhdljCKbmmzLb4NeAOM3LF8M,701
 xoscar/backends/indigen/backend.py,sha256=cCMkZDEKuRQlFb6v79JvWi5lfzsvAafznOeEWlw7CWY,1663
 xoscar/backends/indigen/driver.py,sha256=uLPBAxG7q8ds6yc-baeYUWu_m4K1gST3_BPqkfnlarw,978
-xoscar/backends/indigen/pool.py,sha256=KU36v_Co2sujDiOGhX2I4TZ7kgmDr1Zga8co7uW88TA,17711
+xoscar/backends/indigen/pool.py,sha256=Pyf2sOOBrcEorgM6COZ1ZfJ4AbTY5xAr-i1IL1e3aWo,18801
 xoscar/backends/test/__init__.py,sha256=xgE4hbD3g46G1GDJEeozaXIk57XaahmFMNQsnRzRcrs,698
 xoscar/backends/test/backend.py,sha256=Q4C6TFQzZogjugGmPh3QZw4IigL8VGCFOJ5fKkE1Uvk,1301
 xoscar/backends/test/pool.py,sha256=Eg_P--ErTwd2EowpZZg9BMhAG9UBOfXEHVhEId3OqPw,7465
@@ -54,8 +54,8 @@ xoscar/collective/common.py,sha256=9c7xq3IOUvfA0I9GnpalUqXZOzmF6IEILv4zL64BYVE,3
 xoscar/collective/core.py,sha256=191aPxbUgWpjzrqyozndImDAQhZFmqoQdBkHFLDfXN0,24239
 xoscar/collective/process_group.py,sha256=kTPbrLMJSGhqbiWvTIiz-X3W0rZWd_CFn_zUIlXbOlM,23286
 xoscar/collective/utils.py,sha256=p3WEVtXvnVhkuO5mRgQBhBRFr1dKHcDKMjrbMyuiyfg,1219
-xoscar/collective/uv.dll,sha256=RQCaM3lMwDJk_fyPNUBW74O7_9nxS_HpitHAal3lwo8,620544
-xoscar/collective/xoscar_pygloo.cp39-win_amd64.pyd,sha256=ms2_jjmEbaTzh3dXZOkEH0TKu7YZB161XJA7bw7SD7o,783360
+xoscar/collective/uv.dll,sha256=_SnDfXY93f3o3n4AAnh9qbxtIPDPtdiUDLdNWCLiIGo,620544
+xoscar/collective/xoscar_pygloo.cp39-win_amd64.pyd,sha256=srJprReokcVwH-lVeKru5RsmF2ZX7ryoGZQgSLoeT2Q,783360
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
 xoscar/metrics/backends/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS3Ijp1YgyynoUFLeuU,594
@@ -66,7 +66,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=65hb8O3tmsEJ7jgOrIwl_suj9SE5Tmqcfjuk0urkLvE,2120
 xoscar/serialization/__init__.py,sha256=tS8C49yrW_geWNEsbgW3phK1q4YN1ojI6CN-vroIFYM,876
 xoscar/serialization/aio.py,sha256=7YLXgkWpQ3ANy-TZ1qO8Mt4_J3cZFhFh2FEgUgxMT60,4873
-xoscar/serialization/core.cp39-win_amd64.pyd,sha256=MsgZeC9LTukfxAAyksAf_qfUies6yLzG8R0o_srpM7g,299008
+xoscar/serialization/core.cp39-win_amd64.pyd,sha256=AzktVUU_gYf7tTTtUpyZ6Mj8Wp5KBrhQzH8Po--x-EE,299008
 xoscar/serialization/core.pxd,sha256=X-47bqBM2Kzw5SkLqICdKD0gU6CpmLsBxC3kfW--wVk,1013
 xoscar/serialization/core.pyx,sha256=ZKexLRnRwZXXn2045kR7xfM_szcoPNrDuouQCWtpFp8,30570
 xoscar/serialization/cuda.py,sha256=Fj4Cpr_YmkGceUCo0mQn8fRvmHP_5WcLdRx6epZ3RC0,3869
@@ -78,7 +78,7 @@ xoscar/serialization/scipy.py,sha256=9ph-yoRoNiwUZTwQrn35U60VPirWlncXNAg6EXvqMR4
 xoscar/virtualenv/__init__.py,sha256=rhJ7I6x7aXjKOCzSqsKLwqFJMh4YC2sqchEIJNEfI58,1151
 xoscar/virtualenv/core.py,sha256=pk6Pcv2Aewk1d-oTau1wyP80p8McIi7DodWL9PcDg1Q,1311
 xoscar/virtualenv/uv.py,sha256=xNNjv8Ywkwx6I1B_yQr8nkEUgJbIFNaseUCzWIo41nY,2921
-xoscar-0.6.1.dist-info/METADATA,sha256=7Qhpj9UNCrGu-3Sgfg2VW9QLaJNr5R_bzZDnlNKkkBE,9300
-xoscar-0.6.1.dist-info/WHEEL,sha256=yA7mxgqX2UV73NtJdMh2AAmdb628loM81912H3s5r00,100
-xoscar-0.6.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.6.1.dist-info/RECORD,,
+xoscar-0.6.2.dist-info/METADATA,sha256=VJroGg6xXR_Lb5DJhT3gW6IGBLBy11ZP89Goy9tHDwQ,9300
+xoscar-0.6.2.dist-info/WHEEL,sha256=yA7mxgqX2UV73NtJdMh2AAmdb628loM81912H3s5r00,100
+xoscar-0.6.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.6.2.dist-info/RECORD,,