Ray updated to 2.6.3

open-ce · Aug 25, 2023 · c170add · c170add
1 parent cdcff4d
commit c170add
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 143 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "2.5.0" %}
+{% set version = "2.6.3" %}
 
 package:
   name: ray-packages
@@ -13,15 +13,14 @@ source:
     - 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/0009-Update-protobuf-to-3.19.1.patch    #[protobuf == "3.19.*"]
     - patches/0010-Use-rules_perl-which-is-fixed-for-ppc.patch
     - patches/0011-Fixed-compilation-error.patch
     - patches/0012-Changed-min-bazel-version-to-5.3.patch
     - 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:
@@ -39,7 +38,7 @@ outputs:
         - {{ pin_subpackage('ray-air', exact=True) }}
         - ray-dashboard =={{ version }}=*_{{ PKG_BUILDNUM }}
         - {{ pin_subpackage('ray-default', exact=True) }}
-        - {{ pin_subpackage('ray-k8s', exact=True) }}
+        - {{ pin_subpackage('ray-client', exact=True) }}
         - {{ pin_subpackage('ray-data', exact=True) }}
         - {{ pin_subpackage('ray-rllib', exact=True) }}
         - {{ pin_subpackage('ray-serve', exact=True) }}
@@ -59,11 +58,15 @@ outputs:
         - {{ compiler('cxx') }}   # [ ppc_arch != "p10"]
         - bazel {{ bazel }}
         - sysroot_linux-64 2.17  # [linux64]
+        - patchelf
+        - colorama
         - curl
         - cython >=0.29.32
         - make
         - m2-bash  # [win]
+        - psutil
         - python {{ python }}
+        - setproctitle ==1.2.2
       host:
         - python {{ python }}
         - pip
@@ -75,7 +78,6 @@ outputs:
       run:
         - python {{ python }}
         - aiosignal
-        - attrs {{ attrs }}
         - click {{ click }}
         - colorama
         - filelock
@@ -88,9 +90,8 @@ outputs:
         - psutil {{ psutil }}
         - pyyaml {{ pyyaml }}
         - jsonschema
-        - setproctitle =1.2.2
+        - setproctitle ==1.2.2
         - requests {{ requests }}
-        - virtualenv
 
     test:
       imports:
@@ -139,6 +140,7 @@ outputs:
         - smart_open
         - py-spy >=0.2.0
         - pydantic
+        - virtualenv >=20.0.24,<20.21.1
 
     test:
       imports:
@@ -175,7 +177,7 @@ outputs:
       commands:
         - python -c "import ray; ray.init(include_dashboard=True)"
 
-  - name: ray-k8s
+  - name: ray-client
     requirements:
       host:
         - python {{ python }}
@@ -241,7 +243,7 @@ outputs:
       run:
         - python {{ python }}
         - {{ pin_subpackage('ray-default', exact=True) }}
-        - uvicorn 0.16.0
+        - uvicorn
         - requests {{ requests }}
         - starlette {{ starlette }}
         - fastapi
@@ -263,7 +265,6 @@ outputs:
         - pandas
         - requests {{ requests }}
         - pyarrow {{ arrow }}
-        - tabulate
         - tensorboardX >=1.9
     test:
       imports:

diff --git a/recipe/patches/0002-Redis-deps-now-build-but-do-not-link.patch b/recipe/patches/0002-Redis-deps-now-build-but-do-not-link.patch
@@ -1,21 +1,44 @@
-From 2f46c66596bc113dae774cc86558f31b575dfcd9 Mon Sep 17 00:00:00 2001
-From: Nishidha Panpaliya <npanpa23@in.ibm.com>
-Date: Tue, 10 Jan 2023 06:17:13 +0000
-Subject: [PATCH] Redis patches
+From 5872db3888c7fa3f4352464ae9520b7914bc39c3 Mon Sep 17 00:00:00 2001
+From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
+Date: Fri, 3 Dec 2021 10:46:36 -0800
+Subject: [PATCH 1/5] Redis deps now build but do not link
 
+Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
+Signed-off-by: Gregory Shimansky <gregory.shimansky@intel.com>
+Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
+Signed-off-by: H. Vetinari <h.vetinari@gmx.com>
 ---
- bazel/BUILD.redis                      |  5 ++
- bazel/ray_deps_setup.bzl               |  1 +
- thirdparty/patches/redis-deps-ar.patch | 68 ++++++++++++++++++++++++++
- thirdparty/patches/redis-quiet.patch   | 20 ++++++--
- 4 files changed, 91 insertions(+), 3 deletions(-)
- create mode 100644 thirdparty/patches/redis-deps-ar.patch
+ bazel/BUILD.redis                             | 13 ++-
+ bazel/ray_deps_setup.bzl                      |  2 +-
+ ...01-keep-redis-quiet-and-override-AR.patch} | 79 ++++++++++++++++---
+ 3 files changed, 81 insertions(+), 13 deletions(-)
+ rename thirdparty/patches/{redis-quiet.patch => 0001-keep-redis-quiet-and-override-AR.patch} (53%)
 
 diff --git a/bazel/BUILD.redis b/bazel/BUILD.redis
-index 9edccf578..391e2c035 100644
+index 9edccf5780..60e070028f 100644
 --- a/bazel/BUILD.redis
 +++ b/bazel/BUILD.redis
-@@ -76,5 +76,10 @@ genrule(
+@@ -42,13 +42,17 @@ make(
+
+ genrule_cmd = select({
+     "@bazel_tools//src/conditions:darwin": """
+-        unset CC LDFLAGS CXX CXXFLAGS
++        export CC=$(CC)
++        export CFLAGS=$(CC_FLAGS)
++        export AR=$${CC/gnu-cc/gnu-ar}
++        export NM=$${CC/gnu-cc/gnu-nm}
++        export RANLIB=$${CC/gnu-cc/gnu-ranlib}
+         tmpdir="redis.tmp"
+         p=$(location Makefile)
+         cp -p -L -R -- "$${p%/*}" "$${tmpdir}"
+         chmod +x "$${tmpdir}"/deps/jemalloc/configure
+         parallel="$$(getconf _NPROCESSORS_ONLN || echo 1)"
+-        make -s -C "$${tmpdir}" -j"$${parallel}" V=0 CFLAGS="$${CFLAGS-} -DLUA_USE_MKSTEMP -Wno-pragmas -Wno-empty-body"
++        make -s -C "$${tmpdir}" -j"$${parallel}" V=0 CFLAGS="$${CFLAGS-} -DLUA_USE_MKSTEMP -Wno-pragmas -Wno-empty-body" AR="$${AR}" RANLIB="$${RANLIB}"
+         mv "$${tmpdir}"/src/redis-server $(location redis-server)
+         chmod +x $(location redis-server)
+         mv "$${tmpdir}"/src/redis-cli $(location redis-cli)
+@@ -76,5 +80,10 @@ genrule(
      ],
      cmd = genrule_cmd,
      visibility = ["//visibility:public"],
@@ -27,37 +50,51 @@ index 9edccf578..391e2c035 100644
      tags = ["local"],
  )
 diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
-index 31d5f06b9..90bb78641 100644
+index ce5bd7f23a..33612cfbb4 100644
 --- a/bazel/ray_deps_setup.bzl
 +++ b/bazel/ray_deps_setup.bzl
-@@ -103,6 +103,7 @@ def ray_deps_setup():
-         sha256 = "40827fcaf188456ad9b3be8e27a4f403c43672b6bb6201192dc15756af6f1eae",
+@@ -102,7 +102,7 @@ def ray_deps_setup():
+         url = "https://github.com/redis/redis/archive/refs/tags/7.0.8.tar.gz",
+         sha256 = "0e439cbc19f6db5a4c63d355519ab73bf6ac2ecd47df806c14b19564b3d0c593",
          patches = [
-             "@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
-+            "@com_github_ray_project_ray//thirdparty/patches:redis-deps-ar.patch",
+-            "@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
++            "@com_github_ray_project_ray//thirdparty/patches:0001-keep-redis-quiet-and-override-AR.patch",
          ],
          workspace_file_content = 'workspace(name = "com_github_antirez_redis")'
      )
-diff --git a/thirdparty/patches/redis-deps-ar.patch b/thirdparty/patches/redis-deps-ar.patch
-new file mode 100644
-index 000000000..9bee58342
---- /dev/null
-+++ b/thirdparty/patches/redis-deps-ar.patch
-@@ -0,0 +1,68 @@
-+From 6686b7f7304e0fd32b7be4ff902e0eedc0f7f9f6 Mon Sep 17 00:00:00 2001
-+From: Nishidha Panpaliya <npanpa23@in.ibm.com>
-+Date: Tue, 10 Jan 2023 06:14:14 +0000
-+Subject: [PATCH 2/2] Redis AR changes
+diff --git a/thirdparty/patches/redis-quiet.patch b/thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+similarity index 53%
+rename from thirdparty/patches/redis-quiet.patch
+rename to thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+index d034387596..27c01310ed 100644
+--- a/thirdparty/patches/redis-quiet.patch
++++ b/thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+@@ -1,14 +1,45 @@
++From 10feb7a20122e021efb27d3eebcf55424f3c8d55 Mon Sep 17 00:00:00 2001
++From: mehrdadn <mehrdadn@users.noreply.github.com>
++Date: Tue, 5 May 2020 10:47:49 -0700
++Subject: [PATCH] keep redis quiet and override AR
++
++Patch to keep redis quiet maintained by upstream ray team at
++https://github.com/ray-project/ray/blob/master/thirdparty/patches/redis-quiet.patch
 +
++Extended for conda-forge to enable overriding of AR and RANLIB by:
++
++Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
++Signed-off-by: Matti Picus <matti.picus@gmail.com>
++Signed-off-by: H. Vetinari <h.vetinari@gmx.com>
 +---
-+ deps/Makefile | 8 ++++++--
-+ src/Makefile  | 4 +++-
-+ 2 files changed, 9 insertions(+), 3 deletions(-)
++ deps/Makefile             | 20 +++++++++++---------
++ deps/jemalloc/Makefile.in |  2 +-
++ src/Makefile              | 13 ++++++++-----
++ 3 files changed, 20 insertions(+), 15 deletions(-)
 +
-+diff --git a/deps/Makefile b/deps/Makefile
-+index 0c13eea90..47355278c 100644
-+--- a/deps/Makefile
-++++ b/deps/Makefile
+ diff --git a/deps/Makefile b/deps/Makefile
+-index 8592e17..0c13eea 100644
++index 8592e1766..8089693e0 100644
+ --- a/deps/Makefile
+ +++ b/deps/Makefile
+-@@ -49,19 +49,19 @@ ifeq ($(BUILD_TLS),yes)
 +@@ -11,6 +11,10 @@ BINCOLOR="\033[37;1m"
 + MAKECOLOR="\033[32;1m"
 + ENDCOLOR="\033[0m"
@@ -69,72 +106,46 @@ index 000000000..9bee58342
 + default:
 + 	@echo "Explicit target required"
 + 
-+@@ -50,7 +54,7 @@ endif
-+ 
-+ hiredis: .make-prerequisites
-+ 	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
++@@ -49,19 +53,19 @@ ifeq ($(BUILD_TLS),yes)
+  endif
+
+  hiredis: .make-prerequisites
+ -	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
 +-	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
+ +	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+- 	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
 ++	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS) AR="$(AR)"
-+ 
-+ .PHONY: hiredis
-+ 
-+@@ -86,7 +90,7 @@ ARFLAGS=rc
-+ 
-+ lua: .make-prerequisites
-+ 	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+
+  .PHONY: hiredis
+
+@@ -25,16 +56,22 @@ index 8592e17..0c13eea 100644
+  	cd hdr_histogram && $(MAKE)
+
+  .PHONY: hdr_histogram
+-@@ -85,7 +85,7 @@ AR=ar
+- ARFLAGS=rc
++@@ -81,12 +85,10 @@ endif
++ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
++ # challenging to cross-compile lua (and redis).  These defines make it easier
++ # to fit redis into cross-compilation environments, which typically set AR.
++-AR=ar
++-ARFLAGS=rc
+
+  lua: .make-prerequisites
+ -	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
 +-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ +	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+- 	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
 ++	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" RANLIB="$(RANLIB)"
+
+  .PHONY: lua
+-@@ -98,7 +98,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
 + 
-+ .PHONY: lua
-+ 
-+diff --git a/src/Makefile b/src/Makefile
-+index 704d4b43d..0911b3118 100644
-+--- a/src/Makefile
-++++ b/src/Makefile
-+@@ -306,6 +306,8 @@ SRCCOLOR="\033[33m"
-+ BINCOLOR="\033[37;1m"
-+ MAKECOLOR="\033[32;1m"
-+ ENDCOLOR="\033[0m"
-++AR=ar
-++RANLIB=ranlib
-+ 
-+ ifndef V
-+ QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
-+@@ -352,7 +354,7 @@ persist-settings: distclean
-+ 	echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
-+ 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
-+ 	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
-+-	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
-++	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS) AR="$(AR)" RANLIB="$(RANLIB)" )
-+ 
-+ .PHONY: persist-settings
-+ 
-+-- 
-+2.34.1
-+
-diff --git a/thirdparty/patches/redis-quiet.patch b/thirdparty/patches/redis-quiet.patch
-index d03438759..d03d22c43 100644
---- a/thirdparty/patches/redis-quiet.patch
-+++ b/thirdparty/patches/redis-quiet.patch
-@@ -1,5 +1,16 @@
-+From 489039129eadfeeb3c21f47fba0260846c32dd51 Mon Sep 17 00:00:00 2001
-+From: Nishidha Panpaliya <npanpa23@in.ibm.com>
-+Date: Tue, 10 Jan 2023 06:13:25 +0000
-+Subject: [PATCH 1/2] Redis quiet patch
-+
-+---
-+ deps/Makefile             | 10 +++++-----
-+ deps/jemalloc/Makefile.in |  2 +-
-+ src/Makefile              |  8 ++++----
-+ 3 files changed, 10 insertions(+), 10 deletions(-)
-+
- diff --git a/deps/Makefile b/deps/Makefile
--index 8592e17..0c13eea 100644
-+index 8592e1766..0c13eea90 100644
- --- a/deps/Makefile
- +++ b/deps/Makefile
- @@ -49,19 +49,19 @@ ifeq ($(BUILD_TLS),yes)
-@@ -44,7 +55,7 @@ index 8592e17..0c13eea 100644
++@@ -98,7 +100,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
+  endif
+
+  jemalloc: .make-prerequisites
+@@ -44,7 +81,7 @@ index 8592e17..0c13eea 100644
   	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
 
  diff --git a/deps/jemalloc/Makefile.in b/deps/jemalloc/Makefile.in
@@ -143,22 +154,47 @@ index d03438759..d03d22c43 100644
  --- a/deps/jemalloc/Makefile.in
  +++ b/deps/jemalloc/Makefile.in
  @@ -406,7 +406,7 @@ $(objroot)include/jemalloc/internal/private_namespace_jet.gen.h: $(C_JET_SYMS)
-@@ -57,7 +68,7 @@ index 7128b00..da8e429 100644
+@@ -57,7 +94,7 @@ index 7128b00..da8e429 100644
   $(CPP_OBJS) $(CPP_PIC_OBJS) $(TESTS_CPP_OBJS): %.$(O):
   	@mkdir -p $(@D)
  diff --git a/src/Makefile b/src/Makefile
 -index e4f7d90..704d4b4 100644
-+index e4f7d9068..704d4b43d 100644
++index e4f7d9068..82b6f7cca 100644
  --- a/src/Makefile
  +++ b/src/Makefile
  @@ -115,7 +115,7 @@ endif
-@@ -82,3 +93,6 @@ index e4f7d90..704d4b4 100644
+@@ -69,7 +106,17 @@ index e4f7d90..704d4b4 100644
+  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+  FINAL_LIBS=-lm
+  DEBUG=-g -ggdb
+-@@ -326,9 +326,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
++@@ -307,6 +307,9 @@ BINCOLOR="\033[37;1m"
++ MAKECOLOR="\033[32;1m"
++ ENDCOLOR="\033[0m"
++ 
+++AR=ar
+++RANLIB=ranlib
+++
++ ifndef V
++ QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
++ QUIET_GEN = @printf '    %b %b\n' $(CCCOLOR)GEN$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
++@@ -326,9 +329,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
+  ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ)))
+
+  all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME)
+@@ -82,3 +129,15 @@ index e4f7d90..704d4b4 100644
 
   Makefile.dep:
   	-$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true
++@@ -352,7 +355,7 @@ persist-settings: distclean
++ 	echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
++ 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
++ 	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
++-	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
+++	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS) AR="$(AR)" RANLIB="$(RANLIB)")
++ 
++ .PHONY: persist-settings
++ 
 +-- 
-+2.34.1
++2.38.1.windows.1
 +
--- 
-2.34.1
-