Add ray 2.9.1 patch

Author: qunaibit

graalpython/lib-graalpython/patches/ray/metadata.toml

@@ -5,3 +5,11 @@ patch = 'ray-2.3.0.patch'
 [[add-sources]]
 version = '2.3.0'
 url = 'https://github.com/ray-project/ray/releases/download/ray-2.3.0/ray-2.3.0.tar.gz'
+
+[[rules]]
+version = '== 2.9.1'
+patch = 'ray-2.9.1.patch'
+
+[[add-sources]]
+version = '2.9.1'
+url = 'https://github.com/ray-project/ray/archive/refs/tags/ray-2.9.1.tar.gz'

graalpython/lib-graalpython/patches/ray/ray-2.9.1.patch

@@ -0,0 +1,149 @@
+diff --git a/bazel/ray.bzl b/bazel/ray.bzl
+index 4cd1aa2..95250a4 100644
+--- a/bazel/ray.bzl
++++ b/bazel/ray.bzl
+@@ -30,6 +30,9 @@ PYX_COPTS = select({
+     "//conditions:default": [
+         # Ignore this warning since CPython and Cython have issue removing deprecated tp_print on MacOS
+         "-Wno-deprecated-declarations",
++        "-Wno-unused-variable",
++        "-Wno-unused-function",
++        "-Wno-sign-compare",
+     ],
+ }) + select({
+     "@bazel_tools//src/conditions:windows": [
+diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
+index f91eb30..b0d11ea 100644
+--- a/bazel/ray_deps_setup.bzl
++++ b/bazel/ray_deps_setup.bzl
+@@ -188,6 +188,10 @@ def ray_deps_setup():
+         build_file = True,
+         url = "https://github.com/cython/cython/archive/c48361d0a0969206e227ec016f654c9d941c2b69.tar.gz",
+         sha256 = "37c466fea398da9785bc37fe16f1455d2645d21a72e402103991d9e2fa1c6ff3",
++        patch_cmds = [
++            'graalpy -m autopatch_capi .',
++            '''patch -p1 < "$(graalpy -c 'print(__graalpython__.core_home)')/patches/Cython/Cython-0.29.32.patch"''',
++        ],
+     )
+ 
+     auto_http_archive(
+diff --git a/dashboard/optional_deps.py b/dashboard/optional_deps.py
+index 1dfaaca..6eeb618 100644
+--- a/dashboard/optional_deps.py
++++ b/dashboard/optional_deps.py
+@@ -15,7 +15,7 @@ import aiohttp_cors  # noqa: F401
+ from aiohttp import hdrs  # noqa: F401
+ from aiohttp.typedefs import PathLike  # noqa: F401
+ from aiohttp.web import RouteDef  # noqa: F401
+-import pydantic  # noqa: F401
++# import pydantic  # noqa: F401
+ import grpc  # noqa: F401
+ 
+ # Adding new modules should also be reflected in the
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 0000000..de2b7ad
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,4 @@
++[build-system]
++requires = ["setuptools >= 40.6.0", "wheel", "pip", "psutil", "setproctitle", "colorama"]
++build-backend = "ray_build_backend"
++backend-path = ["."]
+diff --git a/python/ray/_private/services.py b/python/ray/_private/services.py
+index 867b748..40b3fb2 100644
+--- a/python/ray/_private/services.py
++++ b/python/ray/_private/services.py
+@@ -1000,7 +1000,7 @@ def start_ray_process(
+         stdout=stdout_file,
+         stderr=stderr_file,
+         stdin=subprocess.PIPE if pipe_stdin else None,
+-        preexec_fn=preexec_fn if sys.platform != "win32" else None,
++        #preexec_fn=preexec_fn if sys.platform != "win32" else None,
+         creationflags=CREATE_SUSPENDED if win32_fate_sharing else 0,
+     )
+ 
+diff --git a/python/ray/cloudpickle/cloudpickle.py b/python/ray/cloudpickle/cloudpickle.py
+index 9c67ec6..12fda5a 100644
+--- a/python/ray/cloudpickle/cloudpickle.py
++++ b/python/ray/cloudpickle/cloudpickle.py
+@@ -521,10 +521,8 @@ def _walk_global_ops(code):
+     """
+     Yield referenced name for all global-referencing instructions in *code*.
+     """
+-    for instr in dis.get_instructions(code):
+-        op = instr.opcode
+-        if op in GLOBAL_OPS:
+-            yield instr.argval
++    # GraalPy change: we don't support dis
++    yield from code.co_names
+ 
+ 
+ def _extract_class_dict(cls):
+diff --git a/ray_build_backend.py b/ray_build_backend.py
+new file mode 100644
+index 0000000..e9d325f
+--- /dev/null
++++ b/ray_build_backend.py
+@@ -0,0 +1,41 @@
++# We need a whole custom build backend just because the setup.py is in a subdir
++import os
++import re
++import sys
++import tarfile
++import subprocess
++import tempfile
++import shutil
++from pathlib import Path
++
++
++def build_sdist(sdist_directory, config_settings=None):
++    nv = 'ray-2.9.1'
++    srcdir = Path(__file__).parent
++    archive_path = Path(sdist_directory) / f'{nv}.tar.gz'
++
++    def tarfilter(info):
++        if re.match(r'\./(?:.git|bazel-|venv|[^-/]+-venv|dist)', info.name):
++            return None
++        info.name = f'./{nv}/{info.name}'
++        return info
++
++    with tarfile.open(archive_path, 'w:gz') as tar:
++        tar.add('.', filter=tarfilter)
++    return archive_path.name
++
++
++def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
++    wheel_directory = Path(wheel_directory).absolute()
++    os.chdir('python')
++    env = os.environ.copy()
++    env['SKIP_THIRDPARTY_INSTALL'] = 'true'
++    try:
++        subprocess.run([sys.executable, 'setup.py', 'bdist_wheel'], env=env, check=True)
++        wheels = list(Path('dist').glob('*.whl'))
++        assert len(wheels) == 1, f"Expected 1 wheel, found {len(wheels)}"
++        wheel = wheels[0]
++        shutil.copyfile(wheel, wheel_directory / wheel.name)
++        return str(wheel.name)
++    finally:
++        os.chdir('..')
+diff --git a/src/ray/util/logging.cc b/src/ray/util/logging.cc
+index f41aa65..f8e895d 100644
+--- a/src/ray/util/logging.cc
++++ b/src/ray/util/logging.cc
+@@ -374,6 +374,7 @@ bool RayLog::IsFailureSignalHandlerEnabled() {
+ }
+ 
+ void RayLog::InstallFailureSignalHandler(const char *argv0, bool call_previous_handler) {
++    /*
+ #ifdef _WIN32
+   // If process fails to initialize, don't display an error window.
+   SetErrorMode(GetErrorMode() | SEM_FAILCRITICALERRORS);
+@@ -389,6 +390,7 @@ void RayLog::InstallFailureSignalHandler(const char *argv0, bool call_previous_h
+   options.writerfn = WriteFailureMessage;
+   absl::InstallFailureSignalHandler(options);
+   is_failure_signal_handler_installed_ = true;
++  */
+ }
+ 
+ void RayLog::InstallTerminateHandler() { std::set_terminate(TerminateHandler); }