Skip to content

Commit

Permalink
Merge branch 'master' into auto-init
Browse files Browse the repository at this point in the history
  • Loading branch information
raulchen committed May 1, 2023
2 parents fbb6267 + 9b0ca12 commit 1cd013b
Show file tree
Hide file tree
Showing 214 changed files with 5,713 additions and 4,313 deletions.
12 changes: 12 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
workspace(name = "com_github_ray_project_ray")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//bazel:ray_deps_setup.bzl", "ray_deps_setup")

ray_deps_setup()
Expand Down Expand Up @@ -29,3 +30,14 @@ versions.check(minimum_bazel_version = "5.4.0")
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")

hedron_compile_commands_setup()

http_archive(
name = "rules_python",
sha256 = "94750828b18044533e98a129003b6a68001204038dc4749f40b195b24c38f49f",
strip_prefix = "rules_python-0.21.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.21.0/rules_python-0.21.0.tar.gz",
)

load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")

pip_install_dependencies()
25 changes: 14 additions & 11 deletions ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,18 @@ reload_env() {
fi
}

need_wheels() {
local error_code=1
_need_wheels() {
local result="false"
case "${OSTYPE}" in
linux*) if [ "${LINUX_WHEELS-}" = 1 ]; then error_code=0; fi;;
darwin*) if [ "${MAC_WHEELS-}" = 1 ]; then error_code=0; fi;;
msys*) if [ "${WINDOWS_WHEELS-}" = 1 ]; then error_code=0; fi;;
linux*) if [[ "${LINUX_WHEELS-}" == "1" ]]; then result="true"; fi;;
darwin*) if [[ "${MAC_WHEELS-}" == "1" ]]; then result="true"; fi;;
msys*) if [[ "${WINDOWS_WHEELS-}" == "1" ]]; then result="true"; fi;;
esac
return "${error_code}"
echo "${result}"
}

NEED_WHEELS="$(_need_wheels)"

upload_wheels() {
local branch="" commit
commit="$(git rev-parse --verify HEAD)"
Expand Down Expand Up @@ -258,13 +260,14 @@ test_cpp() {
}

test_wheels() {
local result=0 flush_logs=0
local result=0
local flush_logs=0

if need_wheels; then
if [[ "${NEED_WHEELS}" == "true" ]]; then
"${WORKSPACE_DIR}"/ci/build/test-wheels.sh || { result=$? && flush_logs=1; }
fi

if [ 0 -ne "${flush_logs}" ]; then
if [[ 0 -ne "${flush_logs}" ]]; then
cat -- /tmp/ray/session_latest/logs/* || true
sleep 60 # Explicitly sleep 60 seconds for logs to go through
fi
Expand Down Expand Up @@ -746,7 +749,7 @@ build() {
_bazel_build_protobuf
fi

if ! need_wheels; then
if [[ "${NEED_WHEELS}" != "true" ]]; then
install_ray
if [ "${LINT-}" = 1 ]; then
# Try generating Sphinx documentation. To do this, we need to install Ray first.
Expand All @@ -762,7 +765,7 @@ build() {
install_go
fi

if need_wheels; then
if [[ "${NEED_WHEELS}" == "true" ]]; then
build_wheels
fi
}
Expand Down
40 changes: 22 additions & 18 deletions doc/source/cluster/vms/references/ray-cluster-configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1140,33 +1140,37 @@ A list of commands to run to set up worker nodes of this type. These commands wi
``available_node_types.<node_type_name>.node_type.resources.memory``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. tabbed:: AWS

The memory in bytes allocated for python worker heap memory on the node.
If not configured, Autoscaler will automatically detect the amount of RAM on
the node for AWS/Kubernetes and allocate 70% of it for the heap.
.. tab-set::

.. tab-item:: AWS

The memory in bytes allocated for python worker heap memory on the node.
If not configured, Autoscaler will automatically detect the amount of RAM on
the node for AWS/Kubernetes and allocate 70% of it for the heap.

* **Required:** No
* **Importance:** Low
* **Type:** Integer

* **Required:** No
* **Importance:** Low
* **Type:** Integer
.. tab-item:: Azure

.. tabbed:: Azure
The memory in bytes allocated for python worker heap memory on the node.

The memory in bytes allocated for python worker heap memory on the node.
* **Required:** No
* **Importance:** High
* **Type:** Integer

* **Required:** No
* **Importance:** High
* **Type:** Integer
.. tab-item:: GCP

.. tabbed:: GCP
The memory in bytes allocated for python worker heap memory on the node.

The memory in bytes allocated for python worker heap memory on the node.
* **Required:** No
* **Importance:** High
* **Type:** Integer

* **Required:** No
* **Importance:** High
* **Type:** Integer

.. _cluster-configuration-object-store-memory:
.. _cluster-configuration-object-store-memory:

``available_node_types.<node_type_name>.node_type.resources.object-store-memory``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
1 change: 0 additions & 1 deletion doc/source/data/api/input_output.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Synthetic Data
:toctree: doc/

range
range_table
range_tensor

Python Objects
Expand Down
Loading

0 comments on commit 1cd013b

Please sign in to comment.