hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-04 17:41:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump Ray Version from 2.0.0.dev0 to 3.0.0.dev0 (#24894)

Browse source
This commit is contained in:
Simon Mo 2022-05-17 19:31:05 -07:00 • committed by GitHub
parent 4444150c29
commit c3ac6fcf3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 84 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-docker.sh
View file

@ -7,7 +7,7 @@ set -x
GPU="" GPU=""
BASE_IMAGE="ubuntu:focal" BASE_IMAGE="ubuntu:focal"
WHEEL_URL="https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" WHEEL_URL="https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
PYTHON_VERSION="3.7.7" PYTHON_VERSION="3.7.7"

2
doc/source/cluster/config.rst
View file

@ -471,7 +471,7 @@ A list of commands to run to set up nodes. These commands will always run on the
# Default setup_commands: # Default setup_commands:
setup_commands: setup_commands:
- echo 'export PATH="$HOME/anaconda3/envs/tensorflow_p36/bin:$PATH"' >> ~/.bashrc - echo 'export PATH="$HOME/anaconda3/envs/tensorflow_p36/bin:$PATH"' >> ~/.bashrc
- pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl
- Setup commands should ideally be *idempotent* (i.e., can be run multiple times without changing the result); this allows Ray to safely update nodes after they have been created. You can usually make commands idempotent with small modifications, e.g. ``git clone foo`` can be rewritten as ``test -e foo || git clone foo`` which checks if the repo is already cloned first. - Setup commands should ideally be *idempotent* (i.e., can be run multiple times without changing the result); this allows Ray to safely update nodes after they have been created. You can usually make commands idempotent with small modifications, e.g. ``git clone foo`` can be rewritten as ``test -e foo || git clone foo`` which checks if the repo is already cloned first.

2
doc/source/ray-contribute/development.rst
View file

@ -115,7 +115,7 @@ RLlib, Tune, Autoscaler, and most Python files do not require you to build and c
.. code-block:: shell .. code-block:: shell
# For example, for Python 3.8: # For example, for Python 3.8:
pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
4. Replace Python files in the installed package with your local editable copy. We provide a simple script to help you do this: ``python python/ray/setup-dev.py``. Running the script will remove the ``ray/tune``, ``ray/rllib``, ``ray/autoscaler`` dir (among other directories) bundled with the ``ray`` pip package, and replace them with links to your local code. This way, changing files in your git clone will directly affect the behavior of your installed Ray. 4. Replace Python files in the installed package with your local editable copy. We provide a simple script to help you do this: ``python python/ray/setup-dev.py``. Running the script will remove the ``ray/tune``, ``ray/rllib``, ``ray/autoscaler`` dir (among other directories) bundled with the ``ray`` pip package, and replace them with links to your local code. This way, changing files in your git clone will directly affect the behavior of your installed Ray.

4
doc/source/ray-core/handling-dependencies.rst
View file

@ -671,7 +671,7 @@ Example log output:
(pid=runtime_env) activators BashActivator,CShellActivator,FishActivator,NushellActivator,PowerShellActivator,PythonActivator (pid=runtime_env) activators BashActivator,CShellActivator,FishActivator,NushellActivator,PowerShellActivator,PythonActivator
(pid=runtime_env) (pid=runtime_env)
(pid=runtime_env) 2022-02-28 14:12:34,268 INFO utils.py:76 -- Run cmd[2] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-c', 'import ray; print(ray.__version__, ray.__path__[0])'] (pid=runtime_env) 2022-02-28 14:12:34,268 INFO utils.py:76 -- Run cmd[2] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-c', 'import ray; print(ray.__version__, ray.__path__[0])']
(pid=runtime_env) 2022-02-28 14:12:35,118 INFO utils.py:97 -- Output of cmd[2]: 2.0.0.dev0 /Users/user/ray/python/ray (pid=runtime_env) 2022-02-28 14:12:35,118 INFO utils.py:97 -- Output of cmd[2]: 3.0.0.dev0 /Users/user/ray/python/ray
(pid=runtime_env) (pid=runtime_env)
(pid=runtime_env) 2022-02-28 14:12:35,120 INFO pip.py:236 -- Installing python requirements to /tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv (pid=runtime_env) 2022-02-28 14:12:35,120 INFO pip.py:236 -- Installing python requirements to /tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv
(pid=runtime_env) 2022-02-28 14:12:35,122 INFO utils.py:76 -- Run cmd[3] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-m', 'pip', 'install', '--disable-pip-version-check', '--no-cache-dir', '-r', '/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/requirements.txt'] (pid=runtime_env) 2022-02-28 14:12:35,122 INFO utils.py:76 -- Run cmd[3] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-m', 'pip', 'install', '--disable-pip-version-check', '--no-cache-dir', '-r', '/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/requirements.txt']
@ -682,7 +682,7 @@ Example log output:
(pid=runtime_env) Requirement already satisfied: charset-normalizer~=2.0.0 in /Users/user/anaconda3/envs/ray-py38/lib/python3.8/site-packages (from requests->-r /tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/requirements.txt (line 1)) (2.0.6) (pid=runtime_env) Requirement already satisfied: charset-normalizer~=2.0.0 in /Users/user/anaconda3/envs/ray-py38/lib/python3.8/site-packages (from requests->-r /tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/requirements.txt (line 1)) (2.0.6)
(pid=runtime_env) (pid=runtime_env)
(pid=runtime_env) 2022-02-28 14:12:38,001 INFO utils.py:76 -- Run cmd[4] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-c', 'import ray; print(ray.__version__, ray.__path__[0])'] (pid=runtime_env) 2022-02-28 14:12:38,001 INFO utils.py:76 -- Run cmd[4] ['/tmp/ray/session_2022-02-28_14-12-29_909064_87908/runtime_resources/pip/0cc818a054853c3841171109300436cad4dcf594/virtualenv/bin/python', '-c', 'import ray; print(ray.__version__, ray.__path__[0])']
(pid=runtime_env) 2022-02-28 14:12:38,804 INFO utils.py:97 -- Output of cmd[4]: 2.0.0.dev0 /Users/user/ray/python/ray (pid=runtime_env) 2022-02-28 14:12:38,804 INFO utils.py:97 -- Output of cmd[4]: 3.0.0.dev0 /Users/user/ray/python/ray
Regardless of the value of ``RAY_RUNTIME_ENV_LOG_TO_DRIVER_ENABLED``, these logs can always be found in the file ``runtime_env_setup-[job_id].log`` for per-actor, per-task and per-job environments, or in Regardless of the value of ``RAY_RUNTIME_ENV_LOG_TO_DRIVER_ENABLED``, these logs can always be found in the file ``runtime_env_setup-[job_id].log`` for per-actor, per-task and per-job environments, or in
``runtime_env_setup-ray_client_server_[port].log`` for per-job environments when using Ray Client. ``runtime_env_setup-ray_client_server_[port].log`` for per-job environments when using Ray Client.

14
doc/source/ray-observability/ray-metrics.rst
View file

@ -183,16 +183,16 @@ If you open this in the browser, you should see the following output:
# HELP ray_request_latency Latencies of requests in ms. # HELP ray_request_latency Latencies of requests in ms.
# TYPE ray_request_latency histogram # TYPE ray_request_latency histogram
ray_request_latency_bucket{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor",le="0.1"} 2.0 ray_request_latency_bucket{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor",le="0.1"} 2.0
ray_request_latency_bucket{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor",le="1.0"} 2.0 ray_request_latency_bucket{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor",le="1.0"} 2.0
ray_request_latency_bucket{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor",le="+Inf"} 2.0 ray_request_latency_bucket{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor",le="+Inf"} 2.0
ray_request_latency_count{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor"} 2.0 ray_request_latency_count{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor"} 2.0
ray_request_latency_sum{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor"} 0.11992454528808594 ray_request_latency_sum{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor"} 0.11992454528808594
# HELP ray_curr_count Current count held by the actor. Goes up and down. # HELP ray_curr_count Current count held by the actor. Goes up and down.
# TYPE ray_curr_count gauge # TYPE ray_curr_count gauge
ray_curr_count{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor"} -15.0 ray_curr_count{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor"} -15.0
# HELP ray_num_requests_total Number of requests processed by the actor. # HELP ray_num_requests_total Number of requests processed by the actor.
# TYPE ray_num_requests_total counter # TYPE ray_num_requests_total counter
ray_num_requests_total{Component="core_worker",Version="2.0.0.dev0",actor_name="my_actor"} 2.0 ray_num_requests_total{Component="core_worker",Version="3.0.0.dev0",actor_name="my_actor"} 2.0
Please see :ref:`ray.util.metrics <custom-metric-api-ref>` for more details. Please see :ref:`ray.util.metrics <custom-metric-api-ref>` for more details.

28
doc/source/ray-overview/installation.rst
View file

@ -57,20 +57,20 @@ You can install the nightly Ray wheels via the following links. These daily rele
On Windows, support for multi-node Ray clusters is currently experimental and untested. On Windows, support for multi-node Ray clusters is currently experimental and untested.
If you run into issues please file a report at https://github.com/ray-project/ray/issues. If you run into issues please file a report at https://github.com/ray-project/ray/issues.
.. _`Linux Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp39-cp39-manylinux2014_x86_64.whl .. _`Linux Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-manylinux2014_x86_64.whl
.. _`Linux Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl .. _`Linux Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
.. _`Linux Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl .. _`Linux Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
.. _`Linux Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl .. _`Linux Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl
.. _`MacOS Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp39-cp39-macosx_10_15_x86_64.whl .. _`MacOS Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-macosx_10_15_x86_64.whl
.. _`MacOS Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-macosx_10_15_x86_64.whl .. _`MacOS Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-macosx_10_15_x86_64.whl
.. _`MacOS Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl .. _`MacOS Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl
.. _`MacOS Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-macosx_10_15_intel.whl .. _`MacOS Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-macosx_10_15_intel.whl
.. _`Windows Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp39-cp39-win_amd64.whl .. _`Windows Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-win_amd64.whl
.. _`Windows Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-win_amd64.whl .. _`Windows Python 3.8`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-win_amd64.whl
.. _`Windows Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-win_amd64.whl .. _`Windows Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-win_amd64.whl
.. _`Windows Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-win_amd64.whl .. _`Windows Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-win_amd64.whl
Installing from a specific commit Installing from a specific commit
@ -82,11 +82,11 @@ You can install the Ray wheels of any particular commit on ``master`` with the f
pip install https://s3-us-west-2.amazonaws.com/ray-wheels/master/{COMMIT_HASH}/ray-{RAY_VERSION}-{PYTHON_VERSION}-{PYTHON_VERSION}m-{OS_VERSION}.whl pip install https://s3-us-west-2.amazonaws.com/ray-wheels/master/{COMMIT_HASH}/ray-{RAY_VERSION}-{PYTHON_VERSION}-{PYTHON_VERSION}m-{OS_VERSION}.whl
For example, here are the Ray 2.0.0.dev0 wheels for Python 3.7, MacOS for commit ``ba6cebe30fab6925e5b2d9e859ad064d53015246``: For example, here are the Ray 3.0.0.dev0 wheels for Python 3.7, MacOS for commit ``ba6cebe30fab6925e5b2d9e859ad064d53015246``:
.. code-block:: bash .. code-block:: bash
pip install https://s3-us-west-2.amazonaws.com/ray-wheels/master/ba6cebe30fab6925e5b2d9e859ad064d53015246/ray-2.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl pip install https://s3-us-west-2.amazonaws.com/ray-wheels/master/ba6cebe30fab6925e5b2d9e859ad064d53015246/ray-3.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl
There are minor variations to the format of the wheel filename; it's best to match against the format in the URLs listed in the :ref:`Nightlies section <install-nightlies>`. There are minor variations to the format of the wheel filename; it's best to match against the format in the URLs listed in the :ref:`Nightlies section <install-nightlies>`.
Here's a summary of the variations: Here's a summary of the variations:

2
python/ray/__init__.py
View file

@ -110,7 +110,7 @@ del _configure_system
# Replaced with the current commit when building the wheels. # Replaced with the current commit when building the wheels.
__commit__ = "{{RAY_COMMIT_SHA}}" __commit__ = "{{RAY_COMMIT_SHA}}"
__version__ = "2.0.0.dev0" __version__ = "3.0.0.dev0"
import ray._raylet # noqa: E402 import ray._raylet # noqa: E402

4
python/ray/_private/utils.py
View file

@ -1081,13 +1081,13 @@ def get_wheel_filename(
sys_platform (str): The platform as returned by sys.platform. Examples: sys_platform (str): The platform as returned by sys.platform. Examples:
"darwin", "linux", "win32" "darwin", "linux", "win32"
ray_version (str): The Ray version as returned by ray.__version__ or ray_version (str): The Ray version as returned by ray.__version__ or
`ray --version`. Examples: "2.0.0.dev0" `ray --version`. Examples: "3.0.0.dev0"
py_version (str): py_version (str):
The major and minor Python versions concatenated. Examples: "36", The major and minor Python versions concatenated. Examples: "36",
"37", "38", "39" "37", "38", "39"
Returns: Returns:
The wheel file name. Examples: The wheel file name. Examples:
ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
""" """
assert py_version in ["36", "37", "38", "39"], py_version assert py_version in ["36", "37", "38", "39"], py_version

2
python/ray/autoscaler/aws/defaults.yaml
View file

@ -124,7 +124,7 @@ setup_commands:
- >- - >-
(stat $HOME/anaconda3/envs/tensorflow2_latest_p37/ &> /dev/null && (stat $HOME/anaconda3/envs/tensorflow2_latest_p37/ &> /dev/null &&
echo 'export PATH="$HOME/anaconda3/envs/tensorflow2_latest_p37/bin:$PATH"' >> ~/.bashrc) || true echo 'export PATH="$HOME/anaconda3/envs/tensorflow2_latest_p37/bin:$PATH"' >> ~/.bashrc) || true
- which ray || pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" - which ray || pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: head_setup_commands:

2
python/ray/autoscaler/aws/example-full-legacy.yaml
View file

@ -130,7 +130,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: [] head_setup_commands: []

2
python/ray/autoscaler/aws/example-full.yaml
View file

@ -152,7 +152,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: [] head_setup_commands: []

4
python/ray/autoscaler/aws/example-gpu-docker.yaml
View file

@ -113,8 +113,8 @@ file_mounts: {
# List of shell commands to run to set up nodes. # List of shell commands to run to set up nodes.
# NOTE: rayproject/ray:latest has ray latest bundled # NOTE: rayproject/ray:latest has ray latest bundled
setup_commands: [] setup_commands: []
# - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: head_setup_commands:

2
python/ray/autoscaler/azure/defaults.yaml
View file

@ -123,7 +123,7 @@ setup_commands:
- (which conda && echo 'eval "$(conda shell.bash hook)"' >> ~/.bashrc) || true - (which conda && echo 'eval "$(conda shell.bash hook)"' >> ~/.bashrc) || true
# - (conda activate py38_pytorch &> /dev/null && echo 'conda activate py38_pytorch' >> ~/.bashrc) || true # - (conda activate py38_pytorch &> /dev/null && echo 'conda activate py38_pytorch' >> ~/.bashrc) || true
- (conda activate py38_tensorflow &> /dev/null && echo 'conda activate py38_tensorflow' >> ~/.bashrc) || true - (conda activate py38_tensorflow &> /dev/null && echo 'conda activate py38_tensorflow' >> ~/.bashrc) || true
- which ray || pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" - which ray || pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl"
# Consider uncommenting these if you also want to run apt-get commands during setup # Consider uncommenting these if you also want to run apt-get commands during setup
# - sudo pkill -9 apt-get || true # - sudo pkill -9 apt-get || true
# - sudo pkill -9 dpkg || true # - sudo pkill -9 dpkg || true

2
python/ray/autoscaler/azure/example-full-legacy.yaml
View file

@ -132,7 +132,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
# NOTE: rayproject/ray-ml:latest has azure packages bundled # NOTE: rayproject/ray-ml:latest has azure packages bundled

2
python/ray/autoscaler/azure/example-full.yaml
View file

@ -148,7 +148,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
# NOTE: rayproject/ray-ml:latest has azure packages bundled # NOTE: rayproject/ray-ml:latest has azure packages bundled

2
python/ray/autoscaler/azure/example-gpu-docker.yaml
View file

@ -109,7 +109,7 @@ initialization_commands:
# List of shell commands to run to set up nodes. # List of shell commands to run to set up nodes.
# NOTE: rayproject/ray-ml:latest has ray latest bundled # NOTE: rayproject/ray-ml:latest has ray latest bundled
setup_commands: [] setup_commands: []
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
# NOTE: rayproject/ray-ml:latest has azure packages bundled # NOTE: rayproject/ray-ml:latest has azure packages bundled

2
python/ray/autoscaler/gcp/defaults.yaml
View file

@ -139,7 +139,7 @@ setup_commands:
- >- - >-
(stat /opt/conda/bin/ &> /dev/null && (stat /opt/conda/bin/ &> /dev/null &&
echo 'export PATH="/opt/conda/bin:$PATH"' >> ~/.bashrc) || true echo 'export PATH="/opt/conda/bin:$PATH"' >> ~/.bashrc) || true
- which ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl - which ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.

2
python/ray/autoscaler/gcp/example-full.yaml
View file

@ -162,7 +162,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.

4
python/ray/autoscaler/gcp/example-gpu-docker.yaml
View file

@ -135,8 +135,8 @@ initialization_commands:
# List of shell commands to run to set up nodes. # List of shell commands to run to set up nodes.
# NOTE: rayproject/ray-ml:latest has ray latest bundled # NOTE: rayproject/ray-ml:latest has ray latest bundled
setup_commands: [] setup_commands: []
# - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: head_setup_commands:

4
python/ray/autoscaler/gcp/tpu.yaml
View file

@ -60,7 +60,7 @@ head_setup_commands:
- python -m pip install --upgrade pip - python -m pip install --upgrade pip
- python -m pip install --upgrade "jax[cpu]==0.2.14" - python -m pip install --upgrade "jax[cpu]==0.2.14"
- python -m pip install --upgrade fabric dataclasses optax==0.0.6 git+https://github.com/deepmind/dm-haiku google-api-python-client cryptography tensorboardX ray[default] - python -m pip install --upgrade fabric dataclasses optax==0.0.6 git+https://github.com/deepmind/dm-haiku google-api-python-client cryptography tensorboardX ray[default]
- python -m pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl - python -m pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
- git clone https://github.com/Yard1/swarm-jax.git && cd swarm-jax && python -m pip install . - git clone https://github.com/Yard1/swarm-jax.git && cd swarm-jax && python -m pip install .
# Install Jax and other dependencies on TPU # Install Jax and other dependencies on TPU
@ -69,5 +69,5 @@ worker_setup_commands:
- pip3 install --upgrade "jax[tpu]==0.2.14" -f https://storage.googleapis.com/jax-releases/libtpu_releases.html - pip3 install --upgrade "jax[tpu]==0.2.14" -f https://storage.googleapis.com/jax-releases/libtpu_releases.html
- pip3 install --upgrade fabric dataclasses optax==0.0.6 git+https://github.com/deepmind/dm-haiku tensorboardX ray[default] - pip3 install --upgrade fabric dataclasses optax==0.0.6 git+https://github.com/deepmind/dm-haiku tensorboardX ray[default]
- python3 -c "import jax; jax.device_count(); jax.numpy.add(1, 1)" # test if Jax has been installed correctly - python3 -c "import jax; jax.device_count(); jax.numpy.add(1, 1)" # test if Jax has been installed correctly
- pip3 install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl - pip3 install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
- git clone https://github.com/Yard1/swarm-jax.git && cd swarm-jax && sudo pip3 install . - git clone https://github.com/Yard1/swarm-jax.git && cd swarm-jax && sudo pip3 install .

2
python/ray/autoscaler/local/example-full.yaml
View file

@ -116,7 +116,7 @@ setup_commands: []
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image # To run the nightly version of ray (as opposed to the latest), either use a rayproject docker image
# that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line: # that has the "nightly" (e.g. "rayproject/ray-ml:nightly-gpu") or uncomment the following line:
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: [] head_setup_commands: []

2
python/ray/autoscaler/local/example-minimal-automatic.yaml
View file

@ -32,4 +32,4 @@ auth:
# For the latest Python 3.7 Linux wheels: # For the latest Python 3.7 Linux wheels:
# setup_commands: # setup_commands:
# - if [ $(which ray) ]; then pip uninstall ray -y; fi # - if [ $(which ray) ]; then pip uninstall ray -y; fi
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"

2
python/ray/autoscaler/local/example-minimal-manual.yaml
View file

@ -20,4 +20,4 @@ auth:
# For the latest Python 3.7 Linux wheels: # For the latest Python 3.7 Linux wheels:
# setup_commands: # setup_commands:
# - if [ $(which ray) ]; then pip uninstall ray -y; fi # - if [ $(which ray) ]; then pip uninstall ray -y; fi
# - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl" # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl"

18
python/ray/nightly-wheels.yaml
View file

@ -1,14 +1,14 @@
linux: linux:
"3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl "3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
"3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl "3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
"3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl "3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-manylinux2014_x86_64.whl
darwin: darwin:
"3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-macosx_10_15_x86_64.whl "3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-macosx_10_15_x86_64.whl
"3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl "3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-macosx_10_15_intel.whl
"3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-macosx_10_15_intel.whl "3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-macosx_10_15_intel.whl
win32: win32:
"3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-win_amd64.whl "3.8": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-win_amd64.whl
"3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-win_amd64.whl "3.7": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-win_amd64.whl
"3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp36-cp36m-win_amd64.whl "3.6": https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp36-cp36m-win_amd64.whl

2
python/ray/tests/test_cli_patterns/test_no_head.yaml
View file

@ -104,7 +104,7 @@ setup_commands: []
# has your Ray repo pre-cloned. Then, you can replace the pip installs # has your Ray repo pre-cloned. Then, you can replace the pip installs
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# Uncomment the following line if you want to run the nightly version of ray (as opposed to the latest) # Uncomment the following line if you want to run the nightly version of ray (as opposed to the latest)
# - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: [] head_setup_commands: []

2
python/ray/tests/test_cli_patterns/test_no_workers.yaml
View file

@ -105,7 +105,7 @@ setup_commands: []
# has your Ray repo pre-cloned. Then, you can replace the pip installs # has your Ray repo pre-cloned. Then, you can replace the pip installs
# below with a git checkout <your_sha> (and possibly a recompile). # below with a git checkout <your_sha> (and possibly a recompile).
# Uncomment the following line if you want to run the nightly version of ray (as opposed to the latest) # Uncomment the following line if you want to run the nightly version of ray (as opposed to the latest)
# - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
# Custom commands that will be run on the head node after common setup. # Custom commands that will be run on the head node after common setup.
head_setup_commands: [] head_setup_commands: []

4
python/ray/tests/test_runtime_env.py
View file

@ -33,7 +33,7 @@ from ray.runtime_env import RuntimeEnv
def test_get_wheel_filename(): def test_get_wheel_filename():
ray_version = "2.0.0.dev0" ray_version = "3.0.0.dev0"
for sys_platform in ["darwin", "linux", "win32"]: for sys_platform in ["darwin", "linux", "win32"]:
for py_version in ["36", "37", "38", "39"]: for py_version in ["36", "37", "38", "39"]:
filename = get_wheel_filename(sys_platform, ray_version, py_version) filename = get_wheel_filename(sys_platform, ray_version, py_version)
@ -43,7 +43,7 @@ def test_get_wheel_filename():
def test_get_master_wheel_url(): def test_get_master_wheel_url():
ray_version = "2.0.0.dev0" ray_version = "3.0.0.dev0"
test_commit = "58a73821fbfefbf53a19b6c7ffd71e70ccf258c7" test_commit = "58a73821fbfefbf53a19b6c7ffd71e70ccf258c7"
for sys_platform in ["darwin", "linux", "win32"]: for sys_platform in ["darwin", "linux", "win32"]:
for py_version in ["36", "37", "38", "39"]: for py_version in ["36", "37", "38", "39"]:

2
python/ray/train/examples/horovod/horovod-cluster.yaml
View file

@ -48,7 +48,7 @@ available_node_types:
setup_commands: setup_commands:
# This replaces the standard anaconda Ray installation # This replaces the standard anaconda Ray installation
- pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
- pip install ray[tune] - pip install ray[tune]
# Install Horovod # Install Horovod

2
python/ray/train/examples/transformers/cluster.yaml
View file

@ -47,7 +47,7 @@ available_node_types:
setup_commands: setup_commands:
# This replaces the standard anaconda Ray installation # This replaces the standard anaconda Ray installation
- pip install ray[tune] - pip install ray[tune]
- pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl
# Install HuggingFace # Install HuggingFace
- git clone https://github.com/huggingface/transformers || true - git clone https://github.com/huggingface/transformers || true

42
release/ray_release/tests/test_wheels.py
View file

@ -48,20 +48,20 @@ class WheelsFinderTest(unittest.TestCase):
repo_url="https://github.com/ray-project/ray.git", repo_url="https://github.com/ray-project/ray.git",
branch="master", branch="master",
commit="1234", commit="1234",
ray_version="2.0.0.dev0", ray_version="3.0.0.dev0",
) )
self.assertEqual( self.assertEqual(
url, url,
"https://s3-us-west-2.amazonaws.com/ray-wheels/" "https://s3-us-west-2.amazonaws.com/ray-wheels/"
"master/1234/ray-2.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl", "master/1234/ray-3.0.0.dev0-cp37-cp37m-manylinux2014_x86_64.whl",
) )
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindRayWheelsBuildkite(self): def testFindRayWheelsBuildkite(self):
repo = DEFAULT_REPO repo = DEFAULT_REPO
branch = "master" branch = "master"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
os.environ["BUILDKITE_COMMIT"] = commit os.environ["BUILDKITE_COMMIT"] = commit
@ -76,12 +76,12 @@ class WheelsFinderTest(unittest.TestCase):
self.assertEqual(url, get_ray_wheels_url(repo, branch, commit, version)) self.assertEqual(url, get_ray_wheels_url(repo, branch, commit, version))
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindRayWheelsCommitOnly(self): def testFindRayWheelsCommitOnly(self):
repo = DEFAULT_REPO repo = DEFAULT_REPO
branch = "master" branch = "master"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
search_str = commit search_str = commit
@ -110,34 +110,34 @@ class WheelsFinderTest(unittest.TestCase):
self.assertEqual(url, get_ray_wheels_url(repo, branch, commit, version)) self.assertEqual(url, get_ray_wheels_url(repo, branch, commit, version))
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindRayWheelsBranch(self): def testFindRayWheelsBranch(self):
repo = DEFAULT_REPO repo = DEFAULT_REPO
branch = "master" branch = "master"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
self._testFindRayWheelsCheckout( self._testFindRayWheelsCheckout(
repo, branch, commit, version, search_str="master" repo, branch, commit, version, search_str="master"
) )
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindRayWheelsRepoBranch(self): def testFindRayWheelsRepoBranch(self):
repo = DEFAULT_REPO repo = DEFAULT_REPO
branch = "master" branch = "master"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
self._testFindRayWheelsCheckout( self._testFindRayWheelsCheckout(
repo, branch, commit, version, search_str="ray-project:master" repo, branch, commit, version, search_str="ray-project:master"
) )
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindRayWheelsPRRepoBranch(self): def testFindRayWheelsPRRepoBranch(self):
repo = "user" repo = "user"
branch = "dev-branch" branch = "dev-branch"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
self._testFindRayWheelsCheckout( self._testFindRayWheelsCheckout(
repo, branch, commit, version, search_str="user:dev-branch" repo, branch, commit, version, search_str="user:dev-branch"
@ -151,12 +151,12 @@ class WheelsFinderTest(unittest.TestCase):
) )
@patch("time.sleep", lambda *a, **kw: None) @patch("time.sleep", lambda *a, **kw: None)
@patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "2.0.0.dev0") @patch("ray_release.wheels.get_ray_version", lambda *a, **kw: "3.0.0.dev0")
def testFindAndWaitWheels(self): def testFindAndWaitWheels(self):
repo = DEFAULT_REPO repo = DEFAULT_REPO
branch = "master" branch = "master"
commit = "1234" * 10 commit = "1234" * 10
version = "2.0.0.dev0" version = "3.0.0.dev0"
class TrueAfter: class TrueAfter:
def __init__(self, after: float): def __init__(self, after: float):
@ -181,15 +181,15 @@ class WheelsFinderTest(unittest.TestCase):
def testMatchingRayWheelsURL(self): def testMatchingRayWheelsURL(self):
assert not is_wheels_url_matching_ray_verison( assert not is_wheels_url_matching_ray_verison(
f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 8))}", (3, 7) f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 8))}", (3, 7)
) )
assert not is_wheels_url_matching_ray_verison( assert not is_wheels_url_matching_ray_verison(
f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 7))}", (3, 8) f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 7))}", (3, 8)
) )
assert is_wheels_url_matching_ray_verison( assert is_wheels_url_matching_ray_verison(
f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 7))}", (3, 7) f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 7))}", (3, 7)
) )
@patch("ray_release.wheels.resolve_url", lambda url: url) @patch("ray_release.wheels.resolve_url", lambda url: url)
@ -197,10 +197,10 @@ class WheelsFinderTest(unittest.TestCase):
# Do not rewrite if versions match # Do not rewrite if versions match
assert ( assert (
maybe_rewrite_wheels_url( maybe_rewrite_wheels_url(
f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 7))}", f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 7))}",
(3, 7), (3, 7),
) )
== f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 7))}" == f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 7))}"
) )
# Do not rewrite if version can't be parsed # Do not rewrite if version can't be parsed
@ -212,10 +212,10 @@ class WheelsFinderTest(unittest.TestCase):
# Rewrite when version can be parsed # Rewrite when version can be parsed
assert ( assert (
maybe_rewrite_wheels_url( maybe_rewrite_wheels_url(
f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 8))}", f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 8))}",
(3, 7), (3, 7),
) )
== f"http://some/location/{get_wheels_filename('2.0.0dev0', (3, 7))}" == f"http://some/location/{get_wheels_filename('3.0.0dev0', (3, 7))}"
) )
def testWheelsSanityString(self): def testWheelsSanityString(self):

2
src/ray/common/constants.h
View file

@ -52,4 +52,4 @@ constexpr int kMessagePackOffset = 9;
constexpr char kSetupWorkerFilename[] = "setup_worker.py"; constexpr char kSetupWorkerFilename[] = "setup_worker.py";
/// The version of Ray /// The version of Ray
constexpr char kRayVersion[] = "2.0.0.dev0"; constexpr char kRayVersion[] = "3.0.0.dev0";