-
-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ray 1.4.1 #28
Ray 1.4.1 #28
Changes from all commits
c65c000
f356865
59f28c8
440a2ff
a50fbf4
ed2ea02
fbb74dc
7ca68ba
0ad6110
b4111ef
c4d81d8
ce86c2b
28a2855
0e9a7ea
9b99dcd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,10 @@ curl: | |
- '7' | ||
cxx_compiler: | ||
- vs2017 | ||
nodejs: | ||
- '12' | ||
- '14' | ||
- '15' | ||
pin_run_as_build: | ||
curl: | ||
max_pin: x | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,10 @@ curl: | |
- '7' | ||
cxx_compiler: | ||
- vs2017 | ||
nodejs: | ||
- '12' | ||
- '14' | ||
- '15' | ||
pin_run_as_build: | ||
curl: | ||
max_pin: x | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,10 @@ curl: | |
- '7' | ||
cxx_compiler: | ||
- vs2017 | ||
nodejs: | ||
- '12' | ||
- '14' | ||
- '15' | ||
pin_run_as_build: | ||
curl: | ||
max_pin: x | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,10 @@ curl: | |
- '7' | ||
cxx_compiler: | ||
- vs2017 | ||
nodejs: | ||
- '12' | ||
- '14' | ||
- '15' | ||
pin_run_as_build: | ||
curl: | ||
max_pin: x | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
cuda_compiler_version: # [linux64] | ||
- None # [linux64] | ||
docker_image: # [linux64] | ||
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64] | ||
cudnn: # [linux64] | ||
- undefined # [linux64] | ||
cdt_name: # [linux64] | ||
- cos7 # [linux64] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
{% set version = "1.4.0" %} | ||
{% set version = "1.4.1" %} | ||
|
||
package: | ||
name: ray-packages | ||
version: {{ version }} | ||
|
||
source: | ||
url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz | ||
sha256: 1ad04845dad6824220ad7750d666e7186f6b9186fb99294aae7d0e35f8e75018 | ||
sha256: a5fcaeb405fc9e6ddf084d55d202f72c919e974dac736d0426a8b569f7022e4a | ||
patches: | ||
- patches/0001-Do-not-force-pickle5-in-sys.path.patch | ||
- patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch | ||
|
@@ -18,9 +18,9 @@ source: | |
- patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch | ||
- patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch | ||
- patches/0010-Empty-install-requirements-installed-by-conda-build.patch | ||
- patches/0011-permit-python-3.9.patch | ||
- patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch | ||
- patches/0013-Disable-runfiles-on-windows.patch | ||
- patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch | ||
- patches/0012-Disable-runfiles-on-windows.patch | ||
- patches/0013-Add-bazel-linkopts-libs.patch | ||
|
||
|
||
build: | ||
|
@@ -71,6 +71,7 @@ outputs: | |
- {{ compiler('cxx') }} | ||
- bazel <=3.4.1 # [not win] | ||
- bazel <3.7 # [win] | ||
- sysroot_linux-64 2.17 # [linux64] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if we update the base to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's necessary so that this package gets the correct run-export (so that packages depending on ray fail to build if they don't have cos7 themselves), otherwise we might get crashes with the ABI. |
||
- curl | ||
- cython >=0.29 | ||
- make | ||
|
@@ -305,3 +306,4 @@ extra: | |
- dHannasch | ||
- h-vetinari | ||
- vnlitvinov | ||
- krfricke | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. welcome on board! 🙃 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks 😄 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed, already mentioned that on the last PR - happy to have you on board! |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 578717348bb90cd268d339e94b9302d349012929 Mon Sep 17 00:00:00 2001 | ||
From e1c5c21f5a9c254e98a8f10a467a181f9bec04bc Mon Sep 17 00:00:00 2001 | ||
From: Vasily Litvinov <[email protected]> | ||
Date: Thu, 5 Nov 2020 12:04:25 +0300 | ||
Subject: [PATCH 01/13] Do not force pickle5 in sys.path | ||
|
@@ -9,7 +9,7 @@ Signed-off-by: Vasily Litvinov <[email protected]> | |
1 file changed, 6 deletions(-) | ||
|
||
diff --git a/python/ray/__init__.py b/python/ray/__init__.py | ||
index 4f18b9411..45753e5a1 100644 | ||
index 7c5eb9413..918000ce4 100644 | ||
--- a/python/ray/__init__.py | ||
+++ b/python/ray/__init__.py | ||
@@ -33,12 +33,6 @@ def _configure_system(): | ||
|
@@ -26,5 +26,5 @@ index 4f18b9411..45753e5a1 100644 | |
# initialized. | ||
thirdparty_files = os.path.join( | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8936e498f38abd5d12bf0e970f7ddcf276f453f9 Mon Sep 17 00:00:00 2001 | ||
From 2ad3ba43d6f33a9e18b86a5680e15c816b21f980 Mon Sep 17 00:00:00 2001 | ||
From: Vasily Litvinov <[email protected]> | ||
Date: Thu, 5 Nov 2020 17:05:44 +0300 | ||
Subject: [PATCH 02/13] Fix redis build for non-default compiler drivers | ||
|
@@ -29,5 +29,5 @@ index f428f7b36..9ec69d433 100644 | |
|
||
# This library is for internal hiredis use, because hiredis assumes a | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 311235bb948258691dbee9635e366fffc7f0ed3d Mon Sep 17 00:00:00 2001 | ||
From 2fa1e41b13b0caacabda3cac51db475350321f3e Mon Sep 17 00:00:00 2001 | ||
From: Vasily Litvinov <[email protected]> | ||
Date: Fri, 6 Nov 2020 00:55:05 +0300 | ||
Subject: [PATCH 03/13] Redis deps now build but do not link | ||
|
@@ -142,5 +142,5 @@ index 000000000..36497c4b6 | |
+2.11.0 | ||
+ | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8a1a5c64bd41172ebc4fac39cc93baac56137cac Mon Sep 17 00:00:00 2001 | ||
From 4d5363d215b7373d207021032655282e41e9e143 Mon Sep 17 00:00:00 2001 | ||
From: Vasily Litvinov <[email protected]> | ||
Date: Tue, 10 Nov 2020 23:26:35 +0300 | ||
Subject: [PATCH 04/13] Disable making non-core entry scripts | ||
|
@@ -8,10 +8,10 @@ Subject: [PATCH 04/13] Disable making non-core entry scripts | |
1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/python/setup.py b/python/setup.py | ||
index 590020158..ea6925e25 100644 | ||
index 577373e70..cb79b08ca 100644 | ||
--- a/python/setup.py | ||
+++ b/python/setup.py | ||
@@ -444,10 +444,10 @@ setuptools.setup( | ||
@@ -457,10 +457,10 @@ setuptools.setup( | ||
entry_points={ | ||
"console_scripts": [ | ||
"ray=ray.scripts.scripts:main", | ||
|
@@ -27,5 +27,5 @@ index 590020158..ea6925e25 100644 | |
}, | ||
include_package_data=True, | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 1bb7ed73f7b894e84e5e638a4a9f793b99f8c229 Mon Sep 17 00:00:00 2001 | ||
From bfb149410ec41c4e1062a317d4f52374e5ace836 Mon Sep 17 00:00:00 2001 | ||
From: Vasily Litvinov <[email protected]> | ||
Date: Wed, 18 Nov 2020 18:47:40 +0300 | ||
Subject: [PATCH 05/13] Contain bazel root and output dir right above $SRC_DIR | ||
|
@@ -9,10 +9,10 @@ Signed-off-by: Vasily Litvinov <[email protected]> | |
1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/python/setup.py b/python/setup.py | ||
index ea6925e25..e714d988d 100644 | ||
index cb79b08ca..2cfe6f609 100644 | ||
--- a/python/setup.py | ||
+++ b/python/setup.py | ||
@@ -285,12 +285,18 @@ def build(build_python, build_java): | ||
@@ -286,12 +286,18 @@ def build(build_python, build_java): | ||
logger.warning("Expected Bazel version {} but found {}".format( | ||
".".join(map(str, SUPPORTED_BAZEL)), bazel_version_str)) | ||
|
||
|
@@ -33,5 +33,5 @@ index ea6925e25..e714d988d 100644 | |
|
||
|
||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From d0ead439ac7e531f66e867eb19a06c90a6b48e91 Mon Sep 17 00:00:00 2001 | ||
From aef7576624fcbe7f63fdf0703f448c90127e953c Mon Sep 17 00:00:00 2001 | ||
From: Vasilij Litvinov <[email protected]> | ||
Date: Fri, 20 Nov 2020 14:17:05 +0300 | ||
Subject: [PATCH 06/13] Do not crash if BAZEL_SH not set on Windows | ||
|
@@ -9,10 +9,10 @@ Signed-off-by: Vasilij Litvinov <[email protected]> | |
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/python/setup.py b/python/setup.py | ||
index e714d988d..ac937da29 100644 | ||
index 2cfe6f609..248f1cf85 100644 | ||
--- a/python/setup.py | ||
+++ b/python/setup.py | ||
@@ -237,7 +237,7 @@ def build(build_python, build_java): | ||
@@ -238,7 +238,7 @@ def build(build_python, build_java): | ||
SHELL = bazel_env.get("SHELL") | ||
if SHELL: | ||
bazel_env.setdefault("BAZEL_SH", os.path.normpath(SHELL)) | ||
|
@@ -22,5 +22,5 @@ index e714d988d..ac937da29 100644 | |
wsl_bash = os.path.join(SYSTEMROOT, "System32", "bash.exe") | ||
if (not BAZEL_SH) and SYSTEMROOT and os.path.isfile(wsl_bash): | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From e4339570f80880bea34420af7d2310ad6ba44892 Mon Sep 17 00:00:00 2001 | ||
From b9a0c4e81af7ca757bdcff2a057437b253261e41 Mon Sep 17 00:00:00 2001 | ||
From: Vasilij Litvinov <[email protected]> | ||
Date: Fri, 20 Nov 2020 15:32:19 +0300 | ||
Subject: [PATCH 07/13] Convert symlinks to junctions on Windows before | ||
|
@@ -11,10 +11,10 @@ Signed-off-by: Gregory Shimansky <[email protected]> | |
1 file changed, 43 insertions(+) | ||
|
||
diff --git a/python/setup.py b/python/setup.py | ||
index ac937da29..020acc922 100644 | ||
index 248f1cf85..b4f35220f 100644 | ||
--- a/python/setup.py | ||
+++ b/python/setup.py | ||
@@ -216,6 +216,48 @@ def download_pickle5(pickle5_dir): | ||
@@ -217,6 +217,48 @@ def download_pickle5(pickle5_dir): | ||
finally: | ||
wzf.close() | ||
|
||
|
@@ -63,7 +63,7 @@ index ac937da29..020acc922 100644 | |
|
||
def build(build_python, build_java): | ||
if tuple(sys.version_info[:2]) not in SUPPORTED_PYTHONS: | ||
@@ -234,6 +276,7 @@ def build(build_python, build_java): | ||
@@ -235,6 +277,7 @@ def build(build_python, build_java): | ||
bazel_env = dict(os.environ, PYTHON3_BIN_PATH=sys.executable) | ||
|
||
if is_native_windows_or_msys(): | ||
|
@@ -72,5 +72,5 @@ index ac937da29..020acc922 100644 | |
if SHELL: | ||
bazel_env.setdefault("BAZEL_SH", os.path.normpath(SHELL)) | ||
-- | ||
2.30.2 | ||
2.26.2 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so there is no way to stay on
cos6
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, we cannot, see this comment, specifically:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But we can use older
nodejs
, e.g. one from14.x
version part, which is still in "active" phase according to their schedule and works oncos6
:)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, this comment didn't show up in the main thread for some reason.
I'm strongly against pinning to old versions for the sake of EOL distros.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you feel so strongly about cos6-support, we can add a branch where nodejs is pinned to 14.x, but master must move on. (though this would need some care with the build numbers; e.g. build numbers on master start from 100)