Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,31 @@ config_setting(
flag_values = {":jemalloc_flag": "true"},
)

config_setting(
name = "linux_x86_64",
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:x86_64",
],
)

config_setting(
name = "darwin_aarch64",
constraint_values = [
"@platforms//os:osx",
"@platforms//cpu:aarch64",
],
)

alias(
name = "uv_file",
actual = select({
"//:linux_x86_64": "@uv_x86_64-linux//:file",
"//:darwin_aarch64": "@uv_aarch64-darwin//:file",
"//conditions:default": "@uv_x86_64-linux//:file",
}),
)

# bazel run :refresh_compile_commands for compile_commands generation for clangd
# https://github.com/hedronvision/bazel-compile-commands-extractor?tab=readme-ov-file#vscode - directions for clangd config
refresh_compile_commands(
Expand Down
15 changes: 14 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ filegroup(
)

http_archive(
name = "uv_x86_64",
name = "uv_x86_64-linux",
build_file_content = """
filegroup(
name = "file",
Expand All @@ -129,6 +129,19 @@ filegroup(
urls = ["https://github.com/astral-sh/uv/releases/download/0.8.10/uv-x86_64-unknown-linux-gnu.tar.gz"],
)

http_archive(
name = "uv_aarch64-darwin",
build_file_content = """
filegroup(
name = "file",
srcs = glob(["**"]),
visibility = ["//visibility:public"],
)
""",
sha256 = "5200278ae00b5c0822a7db7a99376b2167e8e9391b29c3de22f9e4fdebc9c0e8",
urls = ["https://github.com/astral-sh/uv/releases/download/0.8.10/uv-aarch64-apple-darwin.tar.gz"],
)

http_archive(
name = "com_github_storypku_bazel_iwyu",
sha256 = "aa78c331a2cb139f73f7d74eeb4d5ab29794af82023ef5d6d5194f76b7d37449",
Expand Down
4 changes: 2 additions & 2 deletions ci/compile_llm_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ mkdir -p /tmp/ray-deps

# Remove the GPU constraints
cp python/requirements_compiled.txt /tmp/ray-deps/requirements_compiled.txt
sed -i '/^--extra-index-url /d' /tmp/ray-deps/requirements_compiled.txt
sed -i '/^--find-links /d' /tmp/ray-deps/requirements_compiled.txt
sed -e '/^--extra-index-url /d' -e '/^--find-links /d' /tmp/ray-deps/requirements_compiled.txt > /tmp/ray-deps/requirements_compiled.txt.tmp
mv /tmp/ray-deps/requirements_compiled.txt.tmp /tmp/ray-deps/requirements_compiled.txt
Comment on lines +16 to +17

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just because mac's sed does not have a -i?

maybe convert this into a python script (or py_binary) instead?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH python is less readable than sed, I used temporary file due to #55664 (comment)


bazel run //ci/raydepsets:raydepsets -- build ci/raydepsets/rayllm.depsets.yaml

Expand Down
2 changes: 1 addition & 1 deletion ci/raydepsets/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ py_library(
srcs = [
"cli.py",
],
data = ["@uv_x86_64//:file"],
data = ["//:uv_file"],
deps = [
":workspace",
ci_require("bazel-runfiles"),
Expand Down
13 changes: 8 additions & 5 deletions ci/raydepsets/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,11 @@ def _override_uv_flags(flags: List[str], args: List[str]) -> List[str]:
def _uv_binary():
r = runfiles.Create()
system = platform.system()
if system != "Linux" or platform.processor() != "x86_64":
raise RuntimeError(
f"Unsupported platform/processor: {system}/{platform.processor()}"
)
return r.Rlocation("uv_x86_64/uv-x86_64-unknown-linux-gnu/uv")
processor = platform.processor()

if system == "Linux" and processor == "x86_64":
return r.Rlocation("uv_x86_64-linux/uv-x86_64-unknown-linux-gnu/uv")
elif system == "Darwin" and (processor == "arm" or processor == "aarch64"):
return r.Rlocation("uv_aarch64-darwin/uv-aarch64-apple-darwin/uv")
else:
raise RuntimeError(f"Unsupported platform/processor: {system}/{processor}")
1 change: 1 addition & 0 deletions ci/raydepsets/rayllm.depsets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ build_arg_sets:
- --extra-index-url https://download.pytorch.org/whl/${CUDA_CODE}
append_flags:
- --python-version=3.11
- --python-platform=x86_64-manylinux_2_28

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be manylinux2014 rather than 2_28?

or does generic linux work? which is the default target when running on linux?

the manylinux variation should not really matter here if we are not compiling any (non-python, binary) things from source.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did hit error

  ╰─▶ Because nixl==0.3.1 has no wheels with a matching platform tag (e.g.,
      `manylinux_2_17_x86_64`) and you require nixl==0.3.1, we can conclude that
      your requirements are unsatisfiable.

      hint: Wheels are available for `nixl` (v0.3.1) on the following platform:
      `manylinux_2_28_x86_64````

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you tried "linux"? not sure if we want to pin to a specific manylinux or architecture right now yet.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linux works, updated

and for my own reference astral-sh/uv#14300 uv is aliasing linux to 2_28

build_arg_sets:
- cpu
- cu121
Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_py311_cpu.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cpu.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cpu.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cpu.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cpu.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cpu

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_py311_cu121.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cu121.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cu121.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cu121.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cu121.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu121

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_py311_cu128.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cu128.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cu128.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cu128.txt python/requirements.txt -o python/requirements_compiled_ray_py311_cu128.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu128

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_test_py311_cpu.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cpu.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cpu.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cpu

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_test_py311_cu121.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cu121.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cu121.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu121

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_ray_test_py311_cu128.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cu128.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/requirements_compiled_ray_test_py311_cu128.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu128

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_py311_cpu.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 -c python/requirements_compiled_rayllm_test_py311_cpu.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cpu.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_rayllm_test_py311_cpu.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cpu.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cpu

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_py311_cu121.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 -c python/requirements_compiled_rayllm_test_py311_cu121.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cu121.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_rayllm_test_py311_cu121.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cu121.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu121

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_py311_cu128.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 -c python/requirements_compiled_rayllm_test_py311_cu128.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cu128.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_rayllm_test_py311_cu128.txt python/requirements.txt python/requirements/llm/llm-requirements.txt -o python/requirements_compiled_rayllm_py311_cu128.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu128

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_test_py311_cpu.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cpu.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cpu.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cpu --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cpu.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cpu.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cpu

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_test_py311_cu121.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cu121.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cu121.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu121 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cu121.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cu121.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu121

Expand Down
2 changes: 1 addition & 1 deletion python/requirements_compiled_rayllm_test_py311_cu128.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 -c python/requirements_compiled_ray_test_py311_cu128.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cu128.txt
# uv pip compile --generate-hashes --strip-extras --unsafe-package ray --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --python-version=3.11 --python-platform=x86_64-manylinux_2_28 -c python/requirements_compiled_ray_test_py311_cu128.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/requirements_compiled_rayllm_test_py311_cu128.txt
--index-url https://pypi.org/simple
--extra-index-url https://download.pytorch.org/whl/cu128

Expand Down