[GR-51959] update ray patch

PullRequest: graalpython/3307

Author: qunaibit

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

@@ -1,19 +1,53 @@
+diff --git a/.bazelrc b/.bazelrc
+index c9ba801319..6c25d57934 100644
+--- a/.bazelrc
++++ b/.bazelrc
+@@ -37,6 +37,9 @@ test --test_env=RAY_USAGE_STATS_REPORT_URL="http://127.0.0.1:8000"
+ # Enable cluster mode for OSX and Windows. By default, Ray
+ # will not allow multinode OSX and Windows clusters.
+ test --test_env=RAY_ENABLE_WINDOWS_OR_OSX_CLUSTER="1"
++
++test --jobs=8
++test --local_ram_resources=8192
+ # This is needed for some core tests to run correctly
+ build:windows --enable_runfiles
+ # TODO(mehrdadn): Revert the "-\\.(asm|S)$" exclusion when this Bazel bug
+@@ -92,12 +95,12 @@ build:manylinux2010 --linkopt="-lrt"
+ 
+ # LLVM (clang & libc++) build flags common across Linux installations and systems.
+ # On Ubuntu, the remaining configurations can be generated by running ci/env/install-llvm-binaries.sh
+-build:llvm --action_env=CXXFLAGS=-stdlib=libc++
+-build:llvm --action_env=LDFLAGS=-stdlib=libc++
+-build:llvm --action_env=BAZEL_CXXOPTS=-stdlib=libc++
+-build:llvm --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
+-build:llvm --action_env=BAZEL_LINKOPTS=-lm:-pthread
+-build:llvm --define force_libcpp=enabled
++# build:llvm --action_env=CXXFLAGS=-stdlib=libc++
++# build:llvm --action_env=LDFLAGS=-stdlib=libc++
++# build:llvm --action_env=BAZEL_CXXOPTS=-stdlib=libc++
++# build:llvm --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
++# build:llvm --action_env=BAZEL_LINKOPTS=-lm:-pthread
++# build:llvm --define force_libcpp=enabled
+ 
+ # Thread sanitizer configuration:
+ build:tsan --per_file_copt="-bazel-ray/external/com_github_antirez_redis/.*$@-fsanitize=thread"
 diff --git a/bazel/ray.bzl b/bazel/ray.bzl
-index 4cd1aa2..95250a4 100644
+index 4cd1aa2390..d051a6a36b 100644
 --- a/bazel/ray.bzl
 +++ b/bazel/ray.bzl
-@@ -30,6 +30,9 @@ PYX_COPTS = select({
+@@ -30,6 +30,10 @@ 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-unused-but-set-parameter",
 +        "-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
+index f91eb303c4..b0d11eafe6 100644
 --- a/bazel/ray_deps_setup.bzl
 +++ b/bazel/ray_deps_setup.bzl
 @@ -188,6 +188,10 @@ def ray_deps_setup():
@@ -110,7 +144,7 @@ index bee0ae6..ee0e3ea 100644
                  "module": function.__module__,
                  "function": pickled_function,
 -                "collision_identifier": self.compute_collision_identifier(function),
-+                # "collision_identifier": self.compute_collision_identifier(function),  # code object is missing attribute '_varname_from_oparg'
++                # "collision_identifier": self.compute_collision_identifier(function), # code object is missing attribute '_varname_from_oparg'
                  "max_calls": remote_function._max_calls,
              }
          )
@@ -254,7 +288,7 @@ index a34a39c..51a1a17 100644
              "fastapi",
              "aiorwlock",
 -            "watchfiles",
-+            # "watchfiles", # requires PyO3 patch (require embadding)
++            # "watchfiles", # requires native libs embadding
          ],
          "tune": ["pandas", "tensorboardX>=1.9", "requests", pyarrow_dep, "fsspec"],
          "observability": [
@@ -300,12 +334,22 @@ index a34a39c..51a1a17 100644
 
      bazel_flags = ["--verbose_failures"]
      if BAZEL_ARGS:
+@@ -594,6 +595,9 @@ def build(build_python, build_java, build_cpp):
+     if setup_spec.build_type == BuildType.TSAN:
+         bazel_flags.extend(["--config=tsan"])
+ 
++    if os.environ.get('USE_GCC', '1') == '0':
++        bazel_flags.extend(["--config=llvm"])
++
+     return bazel_invoke(
+         subprocess.check_call,
+         bazel_precmd_flags + ["build"] + bazel_flags + ["--"] + bazel_targets,
 diff --git a/ray_build_backend.py b/ray_build_backend.py
 new file mode 100644
-index 0000000000..10f532ae9e
+index 0000000000..89eb8fee6f
 --- /dev/null
 +++ b/ray_build_backend.py
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,155 @@
 +# We need a whole custom build backend just because the setup.py is in a subdir
 +import os
 +import re
@@ -407,19 +451,49 @@ index 0000000000..10f532ae9e
 +        tar.add('.', filter=tarfilter)
 +    return archive_path.name
 +
++llvm_bazel_conf = """
++build:llvm --action_env='BAZEL_COMPILER={LLVM_HOME}/bin/clang'
++build:llvm --action_env='CC={LLVM_HOME}/bin/clang'
++build:llvm --action_env='CXX={LLVM_HOME}/bin/clang++'
++build:llvm --action_env='LLVM_CONFIG={LLVM_HOME}/bin/llvm-config'
++build:llvm --repo_env='LLVM_CONFIG={LLVM_HOME}/bin/llvm-config'
++build:llvm --linkopt='-fuse-ld={LLVM_HOME}/bin/ld.lld'
++build:llvm --linkopt='-L{LLVM_HOME}/lib'
++build:llvm --linkopt='-Wl,-rpath,{LLVM_HOME}/lib'
++"""
++
 +
 +def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
 +    install_thirdparty_pkgs()
 +    wheel_directory = Path(wheel_directory).absolute()
 +    os.chdir('python')
 +    env = os.environ.copy()
 +    env['SKIP_THIRDPARTY_INSTALL'] = 'true'
-+    try:
-+        system_num_cpus = __graalpython__.get_max_process_count()
-+        env['BAZEL_LIMIT_CPUS'] = '%d' % system_num_cpus
-+    except:
-+        # do not limit bazel
-+        pass
++    use_gcc = env.get('USE_GCC', '0')
++    if use_gcc == '0':
++        llvm_home = env.get('LLVM_HOME', '')
++        if llvm_home == '':
++            clang_path = shutil.which('clang')
++            if clang_path:        
++                bin_path = os.path.dirname(clang_path)
++                llvm_home = os.path.dirname(bin_path)
++        if llvm_home:
++            use_gcc = '0'
++            with open(os.path.join(os.path.dirname(__file__), '.llvm-local.bazelrc'), 'w') as fp:
++                fp.write(llvm_bazel_conf.format(LLVM_HOME=llvm_home))
++        else:
++            # we didn't find clang
++            use_gcc = '1'
++    
++    env['USE_GCC'] = use_gcc
++
++    if not os.environ.get('BAZEL_LIMIT_CPUS'):
++        try:
++            system_num_cpus = __graalpython__.get_max_process_count()
++            env['BAZEL_LIMIT_CPUS'] = '%d' % system_num_cpus
++        except:
++            # do not limit bazel
++            pass
 +    try:
 +        if os.path.isdir(Path('dist')):
 +            shutil.rmtree(Path('dist'))