xoscar 0.3.0__tar.gz → 0.3.1__tar.gz

{xoscar-0.3.0 → xoscar-0.3.1}/PKG-INFO

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

xoscar-0.3.1/pyproject.toml

@@ -0,0 +1,47 @@
+[build-system]
+requires = [
+    "setuptools<64",
+    "packaging",
+    "wheel",
+    "oldest-supported-numpy",
+    "scipy==1.4.1; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'",
+    "scipy==1.7.3; python_version<'3.9' and platform_machine=='arm64'",
+    "scipy==1.5.3; python_version<'3.9' and platform_machine=='aarch64'",
+    "scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
+    "scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
+    "scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
+    "scipy==1.9.2; python_version>='3.11' and python_version<'3.12'",
+    "scipy>=1.11.2; python_version>'3.11'",
+    "pandas==1.0.4; python_version<'3.9' and platform_machine!='aarch64' and platform_machine!='arm64'",
+    "pandas==1.1.3; python_version<'3.9' and platform_machine=='aarch64'",
+    "pandas==1.4.0; python_version<'3.9' and platform_machine=='arm64'",
+    "pandas==1.2.2; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
+    "pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
+    "pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
+    "pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
+    "pandas==1.5.1; python_version>='3.11' and python_version<'3.12'",
+    "pandas>=2.1.1; python_version>'3.11'",
+    "numpy<2.0.0",
+    "cython>=0.29.33",
+    "requests>=2.4.0",
+    "cloudpickle>=2.2.1; python_version>='3.11'",
+    "cloudpickle==1.5.0; python_version<'3.11'",
+]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+include = '\.pyi?$'
+extend-exclude = '''
+^/xoscar/(_version.py)
+'''
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+markers = [
+    "cuda: mark a test as a cuda case.",
+]
+
+[tool.cibuildwheel]
+build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
+skip = "pp* *musllinux* *i686 cp36* cp38-win32 cp39-win32 cp310-win32 cp311-win32"
+manylinux-x86_64-image = "manylinux2014"

{xoscar-0.3.0 → xoscar-0.3.1}/setup.cfg

@@ -24,7 +24,7 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires = 
-	numpy>=1.14.0
+	numpy>=1.14.0,<2.0.0
 	pandas>=1.0.0
 	scipy>=1.0.0; sys_platform!="win32" or python_version>="3.10"
 	scipy>=1.0.0,<=1.9.1; sys_platform=="win32" and python_version<"3.10"
@@ -33,6 +33,7 @@ install_requires =
 	tblib>=1.7.0
 	pickle5; python_version<"3.8"
 	uvloop>=0.14.0; sys_platform!="win32"
+	packaging
 
 [options.packages.find]
 exclude = 

{xoscar-0.3.0 → xoscar-0.3.1}/setup.py

@@ -25,7 +25,7 @@ from sysconfig import get_config_vars
 
 import numpy as np
 from Cython.Build import cythonize
-from pkg_resources import parse_version
+from packaging.version import Version
 from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext
 from setuptools.extension import Library
@@ -63,9 +63,9 @@ if sys.platform == "darwin":
         )
         target_macos_version = "10.9"
 
-        parsed_python_target = parse_version(python_target)
-        parsed_current_system = parse_version(current_system)
-        parsed_macos_version = parse_version(target_macos_version)
+        parsed_python_target = Version(python_target)
+        parsed_current_system = Version(current_system)
+        parsed_macos_version = Version(target_macos_version)
         if parsed_python_target <= parsed_macos_version <= parsed_current_system:
             os.environ["MACOSX_DEPLOYMENT_TARGET"] = target_macos_version
 

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar/__init__.py

@@ -50,7 +50,6 @@ from ._utils import create_actor_ref
 
 # make sure methods are registered
 from .backends import indigen, test
-from .entrypoints import init_extension_entrypoints
 from . import _version
 
 del indigen, test
@@ -59,6 +58,3 @@ _T = TypeVar("_T")
 ActorRefType = Union[ActorRef, _T]
 
 __version__ = _version.get_versions()["version"]
-
-init_extension_entrypoints()
-del init_extension_entrypoints

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar/backends/context.py

@@ -26,7 +26,7 @@ from ..context import BaseActorContext
 from ..core import ActorRef, BufferRef, FileObjectRef, create_local_actor_ref
 from ..debug import debug_async_timeout, detect_cycle_send
 from ..errors import CannotCancelTask
-from ..utils import dataslots
+from ..utils import dataslots, fix_all_zero_ip
 from .allocate_strategy import AddressSpecified, AllocateStrategy
 from .communication import Client, DummyClient, UCXClient
 from .core import ActorCaller
@@ -187,6 +187,7 @@ class IndigenActorContext(BaseActorContext):
 
     async def actor_ref(self, *args, **kwargs):
         actor_ref = create_actor_ref(*args, **kwargs)
+        connect_addr = actor_ref.address
         local_actor_ref = create_local_actor_ref(actor_ref.address, actor_ref.uid)
         if local_actor_ref is not None:
             return local_actor_ref
@@ -195,7 +196,10 @@ class IndigenActorContext(BaseActorContext):
         )
         future = await self._call(actor_ref.address, message, wait=False)
         result = await self._wait(future, actor_ref.address, message)
-        return self._process_result_message(result)
+        res = self._process_result_message(result)
+        if res.address != connect_addr:
+            res.address = fix_all_zero_ip(res.address, connect_addr)
+        return res
 
     async def send(
         self,

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar/backends/core.py

@@ -85,7 +85,8 @@ class ActorCaller:
                         f"Remote server {client.dest_address} closed"
                     ) from None
                 future = self._client_to_message_futures[client].pop(message.message_id)
-                future.set_result(message)
+                if not future.done():
+                    future.set_result(message)
             except DeserializeMessageFailed as e:
                 message_id = e.message_id
                 future = self._client_to_message_futures[client].pop(message_id)

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar/backends/pool.py

@@ -33,7 +33,6 @@ from .._utils import TypeDispatcher, create_actor_ref, to_binary
 from ..api import Actor
 from ..core import ActorRef, BufferRef, FileObjectRef, register_local_pool
 from ..debug import debug_async_timeout, record_message_trace
-from ..entrypoints import init_extension_entrypoints
 from ..errors import (
     ActorAlreadyExist,
     ActorNotExist,
@@ -188,8 +187,6 @@ class AbstractActorPool(ABC):
         self._asyncio_task_timeout_detector_task = (
             register_asyncio_task_timeout_detector()
         )
-        # load third party extensions.
-        init_extension_entrypoints()
         # init metrics
         metric_configs = self._config.get_metric_configs()
         metric_backend = metric_configs.get("backend")

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar/utils.py

@@ -462,3 +462,41 @@ def is_windows():
 
 def is_linux():
     return sys.platform.startswith("linux")
+
+
+def is_v4_zero_ip(ip_port_addr: str) -> bool:
+    return ip_port_addr.startswith("0.0.0.0:")
+
+
+def is_v6_zero_ip(ip_port_addr: str) -> bool:
+    # tcp6 addr ":::123", ":: means all zero"
+    arr = ip_port_addr.split(":")
+    if len(arr) <= 2:  # Not tcp6 or udp6
+        return False
+    for part in arr[0:-1]:
+        if part != "":
+            if int(part, 16) != 0:
+                return False
+    return True
+
+
+def fix_all_zero_ip(remote_addr: str, connect_addr: str) -> str:
+    """
+    Use connect_addr to fix ActorRef.address return by remote server.
+    When remote server listen on "0.0.0.0:port" or ":::port", it will return ActorRef.address set to listening addr,
+    it cannot be use by client for the following interaction unless we fix it.
+    (client will treat 0.0.0.0 as 127.0.0.1)
+
+    NOTE: Server might return a different addr from a pool for load-balance purpose.
+    """
+    if remote_addr == connect_addr:
+        return remote_addr
+    if not is_v4_zero_ip(remote_addr) and not is_v6_zero_ip(remote_addr):
+        # Remote server returns on non-zero ip
+        return remote_addr
+    if is_v4_zero_ip(connect_addr) or is_v6_zero_ip(connect_addr):
+        # Client connect to local server
+        return remote_addr
+    remote_port = remote_addr.split(":")[-1]
+    connect_ip = ":".join(connect_addr.split(":")[0:-1])  # Remote the port
+    return f"{connect_ip}:{remote_port}"

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar.egg-info/PKG-INFO

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

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar.egg-info/SOURCES.txt

@@ -17,7 +17,6 @@ xoscar/core.pxd
 xoscar/core.pyx
 xoscar/debug.py
 xoscar/driver.py
-xoscar/entrypoints.py
 xoscar/errors.py
 xoscar/libcpp.pxd
 xoscar/nvutils.py

{xoscar-0.3.0 → xoscar-0.3.1}/xoscar.egg-info/requires.txt

@@ -1,8 +1,9 @@
-numpy>=1.14.0
+numpy<2.0.0,>=1.14.0
 pandas>=1.0.0
 cloudpickle>=1.5.0
 psutil>=5.9.0
 tblib>=1.7.0
+packaging
 
 [:python_version < "3.8"]
 pickle5

xoscar-0.3.0/pyproject.toml

@@ -1,34 +0,0 @@
-[build-system]
-requires = [
-    "setuptools<64",
-    "wheel",
-    "oldest-supported-numpy",
-    "pandas>=1.0.4",
-    "scipy==1.4.1; python_version<'3.9' and platform_machine!='aarch64'",
-    "scipy==1.5.3; python_version<'3.9' and platform_machine=='aarch64'",
-    "scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and sys_platform=='win32'",
-    "scipy>=1.4.1; python_version>='3.9' and python_version<'3.10' and sys_platform!='win32'",
-    "scipy>=1.4.1; python_version>='3.10'",
-    "cython>=0.29.33",
-    "requests>=2.4.0",
-    "cloudpickle>=2.2.1; python_version>='3.11'",
-    "cloudpickle==1.5.0; python_version<'3.11'",
-]
-build-backend = "setuptools.build_meta"
-
-[tool.black]
-include = '\.pyi?$'
-extend-exclude = '''
-^/xoscar/(_version.py)
-'''
-
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-markers = [
-    "cuda: mark a test as a cuda case.",
-]
-
-[tool.cibuildwheel]
-build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
-skip = "pp* *musllinux* *i686 cp36* cp38-win32 cp39-win32 cp310-win32 cp311-win32"
-manylinux-x86_64-image = "manylinux2014"

xoscar-0.3.0/xoscar/entrypoints.py

@@ -1,42 +0,0 @@
-# Copyright 2022-2023 XProbe Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import functools
-import logging
-import warnings
-
-logger = logging.getLogger(__name__)
-
-
-# from https://github.com/numba/numba/blob/master/numba/core/entrypoints.py
-# Must put this here to avoid extensions re-triggering initialization
-@functools.lru_cache(maxsize=None)
-def init_extension_entrypoints():
-    """Execute all `xoscar_extensions` entry points with the name `init`
-    If extensions have already been initialized, this function does nothing.
-    """
-    from pkg_resources import iter_entry_points  # type: ignore
-
-    for entry_point in iter_entry_points("xoscar_extensions", "init"):
-        logger.info("Loading extension: %s", entry_point)
-        try:
-            func = entry_point.load()
-            func()
-        except Exception as e:
-            msg = "Xoscar extension module '{}' failed to load due to '{}({})'."
-            warnings.warn(
-                msg.format(entry_point.module_name, type(e).__name__, str(e)),
-                stacklevel=2,
-            )
-            logger.info("Extension loading failed for: %s", entry_point)