xoscar 0.3.3__tar.gz → 0.4.0__tar.gz

{xoscar-0.3.3 → xoscar-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.3.3
+Version: 0.4.0
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye
@@ -11,10 +11,10 @@ License: Apache License 2.0
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown

{xoscar-0.3.3 → xoscar-0.4.0}/pyproject.toml

@@ -1,6 +1,7 @@
 [build-system]
 requires = [
-    "setuptools<64",
+    "setuptools<64; python_version<'3.12'",
+    "setuptools>=75; python_version>='3.12'",
     "packaging",
     "wheel",
     "oldest-supported-numpy",
@@ -21,7 +22,7 @@ requires = [
     "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",
+    "numpy",
     "cython>=0.29.33",
     "requests>=2.4.0",
     "cloudpickle>=2.2.1; python_version>='3.11'",
@@ -42,6 +43,6 @@ markers = [
 ]
 
 [tool.cibuildwheel]
-build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
-skip = "pp* *musllinux* *i686 cp36* cp38-win32 cp39-win32 cp310-win32 cp311-win32"
+build = ["cp39-*", "cp310-*", "cp311-*", "cp312-*"]
+skip = "pp* *musllinux* *i686 cp36* cp38-win32 cp39-win32 cp310-win32 cp311-win32 cp312-win32"
 manylinux-x86_64-image = "manylinux2014"

{xoscar-0.3.3 → xoscar-0.4.0}/setup.cfg

@@ -7,15 +7,15 @@ maintainer = Qin Xuye
 maintainer_email = qinxuye@xprobe.io
 license = Apache License 2.0
 url = http://github.com/xorbitsai/xoscar
-python_requires = >=3.8
+python_requires = >=3.9
 classifier = 
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 	Programming Language :: Python :: Implementation :: CPython
 	Topic :: Software Development :: Libraries
 
@@ -24,14 +24,13 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires = 
-	numpy>=1.14.0,<2.0.0
+	numpy>=1.14.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"
 	cloudpickle>=1.5.0
 	psutil>=5.9.0
 	tblib>=1.7.0
-	pickle5; python_version<"3.8"
 	uvloop>=0.14.0; sys_platform!="win32"
 	packaging
 
@@ -50,15 +49,14 @@ dev =
 	pytest-forked>=1.0
 	pytest-asyncio>=0.14.0
 	ipython>=6.5.0
-	sphinx>=3.0.0,<5.0.0
+	sphinx
 	pydata-sphinx-theme>=0.3.0
 	sphinx-intl>=0.9.9
-	mock>=4.0.0; python_version<"3.8"
 	flake8>=3.8.0
 	black
 doc = 
 	ipython>=6.5.0
-	sphinx>=3.0.0,<5.0.0
+	sphinx
 	pydata-sphinx-theme>=0.3.0
 	sphinx-intl>=0.9.9
 extra = 
@@ -82,6 +80,8 @@ omit =
 	xoscar/nvutils.py
 	*.pxd
 	*/tests/*
+disable_warnings = 
+	include-ignored
 
 [coverage:report]
 exclude_lines = 

{xoscar-0.3.3 → xoscar-0.4.0}/setup.py

@@ -17,6 +17,7 @@ import platform
 import re
 import subprocess
 import sys
+import sysconfig
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file, move_file
 from pathlib import Path
@@ -28,6 +29,7 @@ from Cython.Build import cythonize
 from packaging.version import Version
 from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext
+from setuptools.command.install_lib import install_lib
 from setuptools.extension import Library
 
 try:
@@ -143,6 +145,45 @@ PLAT_TO_CMAKE = {
     "win-arm64": "ARM64",
 }
 
+TARGET_TO_PLAT = {
+    'x86': 'win32',
+    'x64': 'win-amd64',
+    'arm': 'win-arm32',
+    'arm64': 'win-arm64',
+}
+
+
+# Copied from https://github.com/pypa/setuptools/blob/main/setuptools/_distutils/util.py#L50
+def get_host_platform():
+    """
+    Return a string that identifies the current platform. Use this
+    function to distinguish platform-specific build directories and
+    platform-specific built distributions.
+    """
+
+    # This function initially exposed platforms as defined in Python 3.9
+    # even with older Python versions when distutils was split out.
+    # Now it delegates to stdlib sysconfig, but maintains compatibility.
+    return sysconfig.get_platform()
+
+
+def get_platform():
+    if os.name == 'nt':
+        target = os.environ.get('VSCMD_ARG_TGT_ARCH')
+        return TARGET_TO_PLAT.get(target) or get_host_platform()
+    return get_host_platform()
+
+
+plat_specifier = ".{}-{}".format(get_platform(), sys.implementation.cache_tag)
+
+
+def get_build_lib():
+    return os.path.join("build", "lib" + plat_specifier)
+
+
+def get_build_temp():
+    return os.path.join("build", 'temp' + plat_specifier)
+
 
 # A CMakeExtension needs a sourcedir instead of a file list.
 # The name must be the _single_ output extension from the CMake build.
@@ -154,6 +195,18 @@ class XoscarCmakeExtension(Extension):
 
 
 class CMakeBuild(build_ext):
+    def finalize_options(self):
+        """
+        For python 3.12, the build_temp and build_lib dirs are temp dirs which are depended on your OS,
+        which leads to that cannot find the copy directory during C++ compiled process.
+        However, for Python < 3.12, these two dirs can be automatically located in the `build` directory of the project directory.
+        Therefore, in order to be compatible with all Python versions,
+        directly using fixed dirs here by coping source codes from `setuptools`.
+        """
+        self.build_temp = get_build_temp()
+        self.build_lib = get_build_lib()
+        super().finalize_options()
+
     def copy_extensions_to_source(self):
         build_py = self.get_finalized_command('build_py')
         for ext in self.extensions:

xoscar-0.4.0/xoscar/aio/__init__.py

@@ -0,0 +1,16 @@
+# 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.
+from .file import AioFileObject
+from .lru import alru_cache
+from .parallelism import AioEvent

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/backends/communication/socket.py

@@ -17,6 +17,7 @@ from __future__ import annotations
 
 import asyncio
 import concurrent.futures as futures
+import logging
 import os
 import socket
 import sys
@@ -30,7 +31,7 @@ from urllib.parse import urlparse
 from ..._utils import to_binary
 from ...constants import XOSCAR_UNIX_SOCKET_DIR
 from ...serialization import AioDeserializer, AioSerializer, deserialize
-from ...utils import classproperty, implements, is_v6_ip
+from ...utils import classproperty, implements, is_py_312, is_v6_ip
 from .base import Channel, ChannelType, Client, Server
 from .core import register_client, register_server
 from .utils import read_buffers, write_buffers
@@ -38,6 +39,9 @@ from .utils import read_buffers, write_buffers
 _is_windows: bool = sys.platform.startswith("win")
 
 
+logger = logging.getLogger(__name__)
+
+
 class SocketChannel(Channel):
     __slots__ = "reader", "writer", "_channel_type", "_send_lock", "_recv_lock"
 
@@ -131,11 +135,23 @@ class _BaseSocketServer(Server, metaclass=ABCMeta):
         if timeout is None:
             await self._aio_server.serve_forever()
         else:
-            future = asyncio.create_task(self._aio_server.serve_forever())
-            try:
-                await asyncio.wait_for(future, timeout=timeout)
-            except (futures.TimeoutError, asyncio.TimeoutError):
-                future.cancel()
+            if is_py_312():
+                # For python 3.12, there's a bug for `serve_forever`:
+                # https://github.com/python/cpython/issues/123720,
+                # which is unable to be cancelled.
+                # Here is really a simulation of `wait_for`
+                task = asyncio.create_task(self._aio_server.serve_forever())
+                await asyncio.sleep(timeout)
+                if task.done():
+                    logger.warning(f"`serve_forever` should never be done.")
+                else:
+                    task.cancel()
+            else:
+                future = asyncio.create_task(self._aio_server.serve_forever())
+                try:
+                    await asyncio.wait_for(future, timeout=timeout)
+                except (futures.TimeoutError, asyncio.TimeoutError, TimeoutError):
+                    future.cancel()
 
     @implements(Server.on_connected)
     async def on_connected(self, *args, **kwargs):
@@ -161,7 +177,10 @@ class _BaseSocketServer(Server, metaclass=ABCMeta):
     @implements(Server.stop)
     async def stop(self):
         self._aio_server.close()
-        await self._aio_server.wait_closed()
+        # Python 3.12: # https://github.com/python/cpython/issues/104344
+        # `wait_closed` leads to hang
+        if not is_py_312():
+            await self._aio_server.wait_closed()
         # close all channels
         await asyncio.gather(
             *(channel.close() for channel in self._channels if not channel.closed)

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/backends/communication/ucx.py

@@ -34,7 +34,7 @@ from .base import Channel, ChannelType, Client, Server
 from .core import register_client, register_server
 from .errors import ChannelClosed
 
-ucp = lazy_import("ucp")
+ucp = lazy_import("ucxx")
 numba_cuda = lazy_import("numba.cuda")
 rmm = lazy_import("rmm")
 
@@ -86,7 +86,7 @@ class UCXInitializer:
                 tls += ",cuda_copy"
 
             if ucx_config.get("infiniband"):  # pragma: no cover
-                tls = "rc," + tls
+                tls = "ib," + tls
             if ucx_config.get("nvlink"):  # pragma: no cover
                 tls += ",cuda_ipc"
 
@@ -177,7 +177,8 @@ class UCXInitializer:
         new_environ.update(envs)
         os.environ = new_environ  # type: ignore
         try:
-            ucp.init(options=options, env_takes_precedence=True)
+            # let UCX determine the appropriate transports
+            ucp.init()
         finally:
             os.environ = original_environ
 
@@ -313,7 +314,7 @@ class UCXChannel(Channel):
                         await self.ucp_endpoint.send(buf)
                 for buffer in buffers:
                     await self.ucp_endpoint.send(buffer)
-        except ucp.exceptions.UCXBaseException:  # pragma: no cover
+        except ucp.exceptions.UCXError:  # pragma: no cover
             self.abort()
             raise ChannelClosed("While writing, the connection was closed")
 
@@ -516,7 +517,7 @@ class UCXClient(Client):
 
         try:
             ucp_endpoint = await ucp.create_endpoint(host, port)
-        except ucp.exceptions.UCXBaseException as e:  # pragma: no cover
+        except ucp.exceptions.UCXError as e:  # pragma: no cover
             raise ChannelClosed(
                 f"Connection closed before handshake completed, "
                 f"local address: {local_address}, dest address: {dest_address}"

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/backends/message.pyx

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import asyncio
 from enum import Enum
 from types import TracebackType
 from typing import Any, Type
@@ -21,7 +22,9 @@ from tblib import pickling_support
 
 from ..core cimport ActorRef, BufferRef
 from ..serialization.core cimport Serializer
+
 from ..utils import wrap_exception
+
 from .._utils cimport new_random_id
 
 # make sure traceback can be pickled
@@ -245,6 +248,11 @@ cdef class ErrorMessage(_MessageBase):
         if issubclass(self.error_type, _AsCauseBase):
             return self.error.with_traceback(self.traceback)
 
+        # for being compatible with Python 3.12 `asyncio.wait_for`
+        # https://github.com/python/cpython/pull/113850
+        if isinstance(self.error, asyncio.CancelledError):
+            return asyncio.CancelledError(f"[address={self.address}, pid={self.pid}]").with_traceback(self.traceback)
+
         return wrap_exception(
             self.error,
             (_AsCauseBase,),

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/backends/pool.py

@@ -41,7 +41,7 @@ from ..errors import (
     ServerClosed,
 )
 from ..metrics import init_metrics
-from ..utils import implements, register_asyncio_task_timeout_detector
+from ..utils import implements, is_zero_ip, register_asyncio_task_timeout_detector
 from .allocate_strategy import AddressSpecified, allocated_type
 from .communication import (
     Channel,
@@ -164,7 +164,10 @@ class AbstractActorPool(ABC):
     ):
         # register local pool for local actor lookup.
         # The pool is weakrefed, so we don't need to unregister it.
-        register_local_pool(external_address, self)
+        if not is_zero_ip(external_address):
+            # Only register_local_pool when we listen on non-zero ip (because all-zero ip is wildcard address),
+            # avoid mistaken with another remote service listen on non-zero ip with the same port.
+            register_local_pool(external_address, self)
         self.process_index = process_index
         self.label = label
         self.external_address = external_address

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/serialization/core.pyx

@@ -55,7 +55,6 @@ from .pyfury import get_fury
 
 BUFFER_PICKLE_PROTOCOL = max(pickle.DEFAULT_PROTOCOL, 5)
 cdef bint HAS_PICKLE_BUFFER = pickle.HIGHEST_PROTOCOL >= 5
-cdef bint _PANDAS_HAS_MGR = hasattr(pd.Series([0]), "_mgr")
 
 cdef TypeDispatcher _serial_dispatcher = TypeDispatcher()
 cdef dict _deserializers = dict()
@@ -260,16 +259,7 @@ def unpickle_buffers(list buffers):
     else:
         result = cloudpickle.loads(buffers[0], buffers=buffers[1:])
 
-    # as pandas prior to 1.1.0 use _data instead of _mgr to hold BlockManager,
-    # deserializing from high versions may produce mal-functioned pandas objects,
-    # thus the patch is needed
-    if _PANDAS_HAS_MGR:
-        return result
-    else:  # pragma: no cover
-        if hasattr(result, "_mgr") and isinstance(result, (pd.DataFrame, pd.Series)):
-            result._data = getattr(result, "_mgr")
-            delattr(result, "_mgr")
-        return result
+    return result
 
 
 cdef class PickleSerializer(Serializer):

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar/utils.py

@@ -30,6 +30,7 @@ import sys
 import time
 import uuid
 from abc import ABC
+from functools import lru_cache
 from types import TracebackType
 from typing import Callable, Type, Union
 
@@ -464,6 +465,11 @@ def is_linux():
     return sys.platform.startswith("linux")
 
 
+@lru_cache
+def is_py_312():
+    return sys.version_info[:2] == (3, 12)
+
+
 def is_v4_zero_ip(ip_port_addr: str) -> bool:
     return ip_port_addr.split("://")[-1].startswith("0.0.0.0:")
 
@@ -480,6 +486,10 @@ def is_v6_zero_ip(ip_port_addr: str) -> bool:
     return True
 
 
+def is_zero_ip(ip_port_addr: str) -> bool:
+    return is_v4_zero_ip(ip_port_addr) or is_v6_zero_ip(ip_port_addr)
+
+
 def is_v6_ip(ip_port_addr: str) -> bool:
     arr = ip_port_addr.split("://", 1)[-1].split(":")
     return len(arr) > 1

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.3.3
+Version: 0.4.0
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye
@@ -11,10 +11,10 @@ License: Apache License 2.0
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar.egg-info/SOURCES.txt

@@ -29,7 +29,6 @@ xoscar.egg-info/not-zip-safe
 xoscar.egg-info/requires.txt
 xoscar.egg-info/top_level.txt
 xoscar/aio/__init__.py
-xoscar/aio/_threads.py
 xoscar/aio/base.py
 xoscar/aio/file.py
 xoscar/aio/lru.py

{xoscar-0.3.3 → xoscar-0.4.0}/xoscar.egg-info/requires.txt

@@ -1,13 +1,10 @@
-numpy<2.0.0,>=1.14.0
+numpy>=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
-
 [:sys_platform != "win32"]
 uvloop>=0.14.0
 
@@ -25,18 +22,15 @@ pytest-timeout>=1.2.0
 pytest-forked>=1.0
 pytest-asyncio>=0.14.0
 ipython>=6.5.0
-sphinx<5.0.0,>=3.0.0
+sphinx
 pydata-sphinx-theme>=0.3.0
 sphinx-intl>=0.9.9
 flake8>=3.8.0
 black
 
-[dev:python_version < "3.8"]
-mock>=4.0.0
-
 [doc]
 ipython>=6.5.0
-sphinx<5.0.0,>=3.0.0
+sphinx
 pydata-sphinx-theme>=0.3.0
 sphinx-intl>=0.9.9
 

xoscar-0.3.3/xoscar/aio/__init__.py

@@ -1,25 +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 asyncio
-import sys
-
-from .file import AioFileObject
-from .lru import alru_cache
-from .parallelism import AioEvent
-
-if sys.version_info[:2] < (3, 9):
-    from ._threads import to_thread
-
-    asyncio.to_thread = to_thread

xoscar-0.3.3/xoscar/aio/_threads.py

@@ -1,35 +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 contextvars
-import functools
-from asyncio import events
-
-__all__ = ("to_thread",)
-
-
-async def to_thread(func, *args, **kwargs):
-    """Asynchronously run function *func* in a separate thread.
-
-    Any *args and **kwargs supplied for this function are directly passed
-    to *func*. Also, the current :class:`contextvars.Context` is propagated,
-    allowing context variables from the main thread to be accessed in the
-    separate thread.
-
-    Return a coroutine that can be awaited to get the eventual result of *func*.
-    """
-    loop = events.get_running_loop()
-    ctx = contextvars.copy_context()
-    func_call = functools.partial(ctx.run, func, *args, **kwargs)
-    return await loop.run_in_executor(None, func_call)