Skip to content

Commit

Permalink
[Ray2.0]update for lastest ray version (#56)
Browse files Browse the repository at this point in the history
* update for lastest ray version

* upgrade streaming java ray deps to 2.0.0

* mark workspace ray native deps in tag-2.0.0

* remove update current thread worker id

Co-authored-by: ashione <lingxuan.zlx@antgroup.com>
  • Loading branch information
ashione and ashione authored Oct 11, 2022
1 parent b3aa39e commit c86b94a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
19 changes: 10 additions & 9 deletions scripts/install-ray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

minor_version=`python -c "import sys;print(sys.version_info[1])"`

if [ "$minor_version" == "8" ] ; then
python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/b7d148815e427ccd47046d1c69ee3ab55bf7db3c/ray-2.0.0.dev0-cp38-cp38-linux_x86_64.whl
elif [ "$minor_version" == "7" ] ; then
python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/0bb82f29b65dca348acf5aa516d21ef3f176a3e1/ray-2.0.0.dev0-cp37-cp37m-linux_x86_64.whl
elif [ "$minor_version" == "6"] ; then
python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/0bb82f29b65dca348acf5aa516d21ef3f176a3e1/ray-2.0.0.dev0-cp36-cp36m-linux_x86_64.whl
else
echo "No such python version"
fi
python -m pip install ray
# if [ "$minor_version" == "8" ] ; then
# python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/b7d148815e427ccd47046d1c69ee3ab55bf7db3c/ray-2.0.0.dev0-cp38-cp38-linux_x86_64.whl
# elif [ "$minor_version" == "7" ] ; then
# python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/0bb82f29b65dca348acf5aa516d21ef3f176a3e1/ray-2.0.0.dev0-cp37-cp37m-linux_x86_64.whl
# elif [ "$minor_version" == "6"] ; then
# python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/0bb82f29b65dca348acf5aa516d21ef3f176a3e1/ray-2.0.0.dev0-cp36-cp36m-linux_x86_64.whl
# else
# echo "No such python version"
# fi
4 changes: 2 additions & 2 deletions streaming/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ workspace(name = "com_github_ray_streaming")

# LOAD RAY WORKSPACE
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
ray_version = "b7d148815e427ccd47046d1c69ee3ab55bf7db3c"
ray_version = "cba26cc83f6b5b8a2ff166594a65cb74c0ec8740"
http_archive(
name="com_github_ray_project_ray",
strip_prefix = "ray-{}".format(ray_version),
urls = ["https://github.com/ray-project/ray/archive/{}.zip".format(ray_version)],
sha256 = "5de3e76a6208c4fc56f7f8a80275705d47b59124947865aa90b1ada96432c522",
sha256 = "8b5bd40cf28372f9684d49ea5627f9ae247854882309f0f261378ba5d849ad24",
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion streaming/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ray.version>1.13.0</ray.version>
<ray.version>2.0.0</ray.version>
<streaming.version>0.0.1</streaming.version>
<mockito.version>1.10.19</mockito.version>
</properties>
Expand Down
4 changes: 3 additions & 1 deletion streaming/src/event_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ void EventService::Execute(Event &event) {

void EventService::LoopThreadHandler() {
if (ray::internal::IsInitialized()) {
ray::internal::SetCurrentThreadWorker(worker_id_);
// NOTE(lingxuan.zlx): feature multi-actors in one single process has been removed,
// so we don't need set current thread worker anymore from ray-2.0.0 branch.
// ray::internal::SetCurrentThreadWorker(worker_id_);
}
while (true) {
if (stop_flag_) {
Expand Down

0 comments on commit c86b94a

Please sign in to comment.