refresh to v2.35 (#22)

open-ce · Oct 4, 2024 · 70eaf90 · 70eaf90
1 parent 665a2b4
commit 70eaf90
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 100 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "2.9.2" %}
+{% set version = "2.35.0" %}
 
 package:
   name: ray-packages
@@ -8,24 +8,20 @@ source:
   git_url: https://github.com/ray-project/ray
   git_rev: ray-{{ version }}
   patches:
-    - patches/0001-add-name-attribute-for-googletest.patch
+    - patches/0001-patch_for_rules_python.patch   #[ppc64le]
     - patches/0002-patch-redis-for-ar-ranlib.patch
-    - patches/0007-Update-skylib-commit.patch
     - patches/0003-Disable-making-non-core-entry-scripts.patch
     - patches/0004-Remove-all-dependencies-from-setup.py.patch
     - patches/0005-Ignore-warnings-in-event.cc-and-logging.cc.patch
     - patches/0006-Add-bazel-linkopts-libs.patch
-    - patches/0007-Update-skylib-commit.patch
     - patches/0008-Fixed-compilation-error.patch
     - patches/0009-fixed-grpc-issue.patch          #[x86_64]
     - patches/0010-Use-rules_perl-which-is-fixed-for-ppc.patch
     - patches/0011-grpc-change-only.patch       #[ppc64le]
     - patches/0012-Fixed-boringssl-issue.patch  #[ppc64le]
-    - patches/0013-Added-patch-for-rules_python-on-ppc64le.patch    #[ppc64le]
-    - patches/0014-allow-builds-with-root-user.patch    #[ppc64le]
 
 build:
-  number: 3
+  number: 1
 
 # Need these up here for conda-smithy to handle them properly.
 requirements:
@@ -61,7 +57,7 @@ outputs:
       build:
         - {{ compiler('c') }}     # [ ppc_arch != "p10"]
         - {{ compiler('cxx') }}   # [ ppc_arch != "p10"]
-        - bazel {{ bazel }}
+        - bazel 6.5.0
         - sysroot_linux-64 2.17  # [linux64]
         - patchelf
         - colorama

diff --git a/recipe/patches/0001-add-name-attribute-for-googletest.patch b/recipe/patches/0001-add-name-attribute-for-googletest.patch
diff --git a/recipe/patches/0001-patch_for_rules_python.patch b/recipe/patches/0001-patch_for_rules_python.patch
@@ -0,0 +1,28 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index cf7d84bc88..5455e8319f 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -16,6 +16,15 @@ ray_deps_setup()
+
+ load("//bazel:ray_deps_build_all.bzl", "ray_deps_build_all")
+
++http_archive(
++    name = "rules_python",
++    sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
++    strip_prefix = "rules_python-0.31.0",
++    url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
++)
++
++load("@rules_python//python:repositories.bzl","py_repositories")
++py_repositories()
+ ray_deps_build_all()
+
+ # This needs to be run after grpc_deps() in ray_deps_build_all() to make
+@@ -52,6 +61,7 @@ python_register_toolchains(
+     name = "python3_9",
+     python_version = "3.9",
+     register_toolchains = False,
++    ignore_root_user_error = True,
+ )
+
+ load("@python3_9//:defs.bzl", python39 = "interpreter")
diff --git a/recipe/patches/0002-patch-redis-for-ar-ranlib.patch b/recipe/patches/0002-patch-redis-for-ar-ranlib.patch
@@ -1,7 +1,7 @@
-From 6b3012200c7ef4ec2a8ffde38bfbb8760cfe9ec4 Mon Sep 17 00:00:00 2001
+From 467abd481f53008675173b07b8a79a5110b74762 Mon Sep 17 00:00:00 2001
 From: mattip <[email protected]>
 Date: Mon, 25 Dec 2023 11:55:35 +0200
-Subject: [PATCH 1/9] patch redis for ar, ranlib
+Subject: [PATCH 1/7] patch redis for ar, ranlib
 
 Signed-off-by: Vasily Litvinov <[email protected]>
 Signed-off-by: Gregory Shimansky <[email protected]>
@@ -127,5 +127,5 @@ index 0000000000..72a4097cd3
 + .PHONY: persist-settings
 +
 -- 
-2.40.1
+2.34.1
 
diff --git a/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch b/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch
@@ -1,28 +1,35 @@
-From a5a4411a7ad8ca1dcd3ffcb1175340923e289da6 Mon Sep 17 00:00:00 2001
+From 79c291e9be8fdaf4364668d138a63e32dce6cfe2 Mon Sep 17 00:00:00 2001
 From: mattip <[email protected]>
-Date: Mon, 25 Dec 2023 12:13:06 +0200
-Subject: [PATCH 4/7] Remove all dependencies from setup.py
+Date: Wed, 28 Aug 2024 09:25:55 +0300
+Subject: [PATCH] remove dependencies and third party package installs from
+ setup.py
 
 ---
- python/setup.py | 121 +++++-------------------------------------------
- 1 file changed, 12 insertions(+), 109 deletions(-)
+ python/setup.py | 156 +++++++++---------------------------------------
+ 1 file changed, 27 insertions(+), 129 deletions(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index bbf74a8b45..0aa524af1b 100644
+index 0ae87994f8..2bb59bb944 100644
 --- a/python/setup.py
 +++ b/python/setup.py
-@@ -225,103 +225,18 @@ ray_files += [
+@@ -225,113 +225,23 @@ ray_files += [
  # also update the matching section of requirements/requirements.txt
  # in this directory
  if setup_spec.type == SetupType.RAY:
 -    pandas_dep = "pandas >= 1.3"
 -    numpy_dep = "numpy >= 1.20"
--    if sys.platform != "win32":
--        pyarrow_dep = "pyarrow >= 6.0.1"
--    else:
--        # Serialization workaround for pyarrow 7.0.0+ doesn't work for Windows.
--        pyarrow_dep = "pyarrow >= 6.0.1, < 7.0.0"
+-    pyarrow_dep = "pyarrow >= 6.0.1"
      setup_spec.extras = {
+-        "adag": [
+-            "cupy-cuda12x; sys_platform != 'darwin'",
+-        ],
+-        "client": [
+-            # The Ray client needs a specific range of gRPC to work:
+-            # Tracking issues: https://github.com/grpc/grpc/issues/33714
+-            "grpcio != 1.56.0"
+-            if sys.platform == "darwin"
+-            else "grpcio",
+-        ],
 -        "data": [
 -            numpy_dep,
 -            pandas_dep,
@@ -31,55 +38,47 @@ index bbf74a8b45..0aa524af1b 100644
 -        ],
 -        "default": [
 -            # If adding dependencies necessary to launch the dashboard api server,
--            # please add it to dashboard/optional_deps.py as well.
+-            # please add it to python/ray/dashboard/optional_deps.py as well.
 -            "aiohttp >= 3.7",
 -            "aiohttp_cors",
 -            "colorful",
 -            "py-spy >= 0.2.0",
 -            "requests",
--            "gpustat >= 1.0.0",  # for windows
 -            "grpcio >= 1.32.0; python_version < '3.10'",  # noqa:E501
 -            "grpcio >= 1.42.0; python_version >= '3.10'",  # noqa:E501
 -            "opencensus",
 -            "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3",
 -            "prometheus_client >= 0.7.1",
 -            "smart_open",
 -            "virtualenv >=20.0.24, !=20.21.1",  # For pip runtime env.
+-            "memray; sys_platform != 'win32'",
 -        ],
--        "client": [
--            # The Ray client needs a specific range of gRPC to work:
--            # Tracking issues: https://github.com/grpc/grpc/issues/33714
--            "grpcio != 1.56.0"
--            if sys.platform == "darwin"
--            else "grpcio",
+-        "observability": [
+-            "opentelemetry-api",
+-            "opentelemetry-sdk",
+-            "opentelemetry-exporter-otlp",
 -        ],
 -        "serve": [
 -            "uvicorn[standard]",
 -            "requests",
 -            "starlette",
--            # Tracking issue: https://github.com/tiangolo/fastapi/discussions/10948
--            "fastapi <= 0.108.0",
--            "aiorwlock",
+-            "fastapi",
 -            "watchfiles",
 -        ],
 -        "tune": ["pandas", "tensorboardX>=1.9", "requests", pyarrow_dep, "fsspec"],
--        "observability": [
--            "opentelemetry-api",
--            "opentelemetry-sdk",
--            "opentelemetry-exporter-otlp",
--        ],
++        "adag": [],
++        "air": [],
++        "client": [],
 +        "data": [],
 +        "default": [],
-+        "client": [],
-+        "serve": [],
-+        "tune": [],
 +        "observability": [],
-+        "serve-grpc": [],
 +        "rllib": [],
++        "serve": [],
++        "serve-grpc": [],
++        "tune": [],
 +        "train": [],
-+        "air": [],
      }
--
+ 
 -    # Ray Serve depends on the Ray dashboard components.
 -    setup_spec.extras["serve"] = list(
 -        set(setup_spec.extras["serve"] + setup_spec.extras["default"])
@@ -122,10 +121,24 @@ index bbf74a8b45..0aa524af1b 100644
 -        )
 -    )
 -
+-    # "all" will not include "cpp" anymore. It is a big depedendency
+-    # that most people do not need.
+-    #
+-    # Instead, when cpp is supported, we add a "all-cpp".
      setup_spec.extras["all"] = list(
-         set(chain.from_iterable(setup_spec.extras.values()))
+-        set(
+-            chain.from_iterable([v for k, v in setup_spec.extras.items() if k != "cpp"])
+-        )
++        set(chain.from_iterable(setup_spec.extras.values()))
      )
-@@ -334,19 +249,7 @@ if setup_spec.type == SetupType.RAY:
+-    if RAY_EXTRA_CPP:
+-        setup_spec.extras["all-cpp"] = list(
+-            set(setup_spec.extras["all"] + setup_spec.extras["cpp"])
+-        )
+
+ # These are the main dependencies for users of ray. This list
+ # should be carefully curated. If you change it, please reflect
+@@ -341,19 +251,7 @@ if setup_spec.type == SetupType.RAY:
  # install-core-prerelease-dependencies.sh so we can test
  # new releases candidates.
  if setup_spec.type == SetupType.RAY:
@@ -146,7 +159,40 @@ index bbf74a8b45..0aa524af1b 100644
 
  def is_native_windows_or_msys():
      """Check to see if we are running on native Windows,
-@@ -781,7 +684,7 @@ setuptools.setup(
+@@ -542,19 +440,19 @@ def build(build_python, build_java, build_cpp):
+             env=dict(os.environ, CC="gcc"),
+         )
+
+-    # runtime env agent dependenceis
+-    runtime_env_agent_pip_packages = ["aiohttp"]
+-    subprocess.check_call(
+-        [
+-            sys.executable,
+-            "-m",
+-            "pip",
+-            "install",
+-            "-q",
+-            "--target=" + os.path.join(ROOT_DIR, RUNTIME_ENV_AGENT_THIRDPARTY_SUBDIR),
+-        ]
+-        + runtime_env_agent_pip_packages
+-    )
++        # runtime env agent dependenceis
++        runtime_env_agent_pip_packages = ["aiohttp"]
++        subprocess.check_call(
++            [
++                sys.executable,
++                "-m",
++                "pip",
++                "install",
++                "-q",
++                "--target=" + os.path.join(ROOT_DIR, RUNTIME_ENV_AGENT_THIRDPARTY_SUBDIR),
++            ]
++            + runtime_env_agent_pip_packages
++        )
+
+     bazel_flags = ["--verbose_failures"]
+     if BAZEL_ARGS:
+@@ -797,7 +695,7 @@ setuptools.setup(
      # The BinaryDistribution argument triggers build_ext.
      distclass=BinaryDistribution,
      install_requires=setup_spec.install_requires,
@@ -156,5 +202,5 @@ index bbf74a8b45..0aa524af1b 100644
      entry_points={
          "console_scripts": [
 -- 
-2.34.1
+2.43.0
 
diff --git a/recipe/patches/0007-Update-skylib-commit.patch b/recipe/patches/0007-Update-skylib-commit.patch