From f2d7980066636a65e70d1d1724fcabf7b909d663 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Wed, 7 Aug 2024 18:24:02 -0700 Subject: [PATCH 01/13] [Core] Add ray[adag] option to pip install Signed-off-by: Rui Qiao --- python/requirements.txt | 1 + python/setup.py | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/python/requirements.txt b/python/requirements.txt index 5835e23f8f50..17647066114b 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -8,6 +8,7 @@ ## setup.py install_requires click>=7.0 +cupy-cuda12x; sys_platform != 'darwin' filelock jsonschema msgpack<2.0.0,>=1.0.0 diff --git a/python/setup.py b/python/setup.py index d455cda32f8c..0ae87994f856 100644 --- a/python/setup.py +++ b/python/setup.py @@ -229,6 +229,16 @@ def get_packages(self): numpy_dep = "numpy >= 1.20" pyarrow_dep = "pyarrow >= 6.0.1" setup_spec.extras = { + "adag": [ + "cupy-cuda12x; sys_platform != 'darwin'", + ], + "client": [ + # The Ray client needs a specific range of gRPC to work: + # Tracking issues: https://github.com/grpc/grpc/issues/33714 + "grpcio != 1.56.0" + if sys.platform == "darwin" + else "grpcio", + ], "data": [ numpy_dep, pandas_dep, @@ -252,12 +262,10 @@ def get_packages(self): "virtualenv >=20.0.24, !=20.21.1", # For pip runtime env. "memray; sys_platform != 'win32'", ], - "client": [ - # The Ray client needs a specific range of gRPC to work: - # Tracking issues: https://github.com/grpc/grpc/issues/33714 - "grpcio != 1.56.0" - if sys.platform == "darwin" - else "grpcio", + "observability": [ + "opentelemetry-api", + "opentelemetry-sdk", + "opentelemetry-exporter-otlp", ], "serve": [ "uvicorn[standard]", @@ -267,11 +275,6 @@ def get_packages(self): "watchfiles", ], "tune": ["pandas", "tensorboardX>=1.9", "requests", pyarrow_dep, "fsspec"], - "observability": [ - "opentelemetry-api", - "opentelemetry-sdk", - "opentelemetry-exporter-otlp", - ], } # Ray Serve depends on the Ray dashboard components. From 236121d7bf0c08a8f5e4fb427e6e5e2920b47031 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Fri, 9 Aug 2024 17:35:40 -0700 Subject: [PATCH 02/13] up Signed-off-by: Rui Qiao --- python/ray/util/collective/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ray/util/collective/requirements.txt b/python/ray/util/collective/requirements.txt index ce5057b221f1..3fcd8b17c1ff 100644 --- a/python/ray/util/collective/requirements.txt +++ b/python/ray/util/collective/requirements.txt @@ -1 +1 @@ -cupy-cuda100 \ No newline at end of file +cupy-cuda12x \ No newline at end of file From f94df2c11c6258162f30035796868b93d9b22ec1 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Fri, 9 Aug 2024 18:19:44 -0700 Subject: [PATCH 03/13] up Signed-off-by: Rui Qiao --- ci/ray_ci/doc/cmd_build.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/ray_ci/doc/cmd_build.py b/ci/ray_ci/doc/cmd_build.py index 3255398137f3..a81ec64ef008 100644 --- a/ci/ray_ci/doc/cmd_build.py +++ b/ci/ray_ci/doc/cmd_build.py @@ -54,6 +54,9 @@ def _build(ray_checkout_dir): # We need to unset PYTHONPATH to use the Python from the environment instead of # from the Bazel runfiles. env.update({"PYTHONPATH": ""}) + import numpy + logger.info(f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}") + logger.info(f"test = {numpy.__version__ < '2'}") subprocess.run( ["make", "html"], cwd=os.path.join(ray_checkout_dir, "doc"), From cde3d99c87113019d6cb026a5847f4f22e03b8a8 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Mon, 12 Aug 2024 13:09:49 -0700 Subject: [PATCH 04/13] up Signed-off-by: Rui Qiao --- ci/ray_ci/doc/cmd_build.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/ray_ci/doc/cmd_build.py b/ci/ray_ci/doc/cmd_build.py index a81ec64ef008..a93cca8f7a62 100644 --- a/ci/ray_ci/doc/cmd_build.py +++ b/ci/ray_ci/doc/cmd_build.py @@ -54,9 +54,12 @@ def _build(ray_checkout_dir): # We need to unset PYTHONPATH to use the Python from the environment instead of # from the Bazel runfiles. env.update({"PYTHONPATH": ""}) - import numpy - logger.info(f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}") - logger.info(f"test = {numpy.__version__ < '2'}") + try: + import numpy + logger.info(f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}") + logger.info(f"test = {numpy.__version__ < '2'}") + except Exception as e: + logger.error(f"Failed to import numpy: {e}") subprocess.run( ["make", "html"], cwd=os.path.join(ray_checkout_dir, "doc"), From 47c557ef11d95aa0b48794896dcd919110734059 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Mon, 12 Aug 2024 17:33:06 -0700 Subject: [PATCH 05/13] up Signed-off-by: Rui Qiao --- ci/ray_ci/doc/cmd_build.py | 5 ++++- python/ray/util/collective/requirements.txt | 2 +- python/setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/ray_ci/doc/cmd_build.py b/ci/ray_ci/doc/cmd_build.py index a93cca8f7a62..47d0831cfd02 100644 --- a/ci/ray_ci/doc/cmd_build.py +++ b/ci/ray_ci/doc/cmd_build.py @@ -56,7 +56,10 @@ def _build(ray_checkout_dir): env.update({"PYTHONPATH": ""}) try: import numpy - logger.info(f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}") + + logger.info( + f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}" + ) logger.info(f"test = {numpy.__version__ < '2'}") except Exception as e: logger.error(f"Failed to import numpy: {e}") diff --git a/python/ray/util/collective/requirements.txt b/python/ray/util/collective/requirements.txt index 3fcd8b17c1ff..59d2ac8473a5 100644 --- a/python/ray/util/collective/requirements.txt +++ b/python/ray/util/collective/requirements.txt @@ -1 +1 @@ -cupy-cuda12x \ No newline at end of file +cupy-cuda12x>=13.2.0; sys_platform != 'darwin' \ No newline at end of file diff --git a/python/setup.py b/python/setup.py index 0ae87994f856..a2009c5d01eb 100644 --- a/python/setup.py +++ b/python/setup.py @@ -230,7 +230,7 @@ def get_packages(self): pyarrow_dep = "pyarrow >= 6.0.1" setup_spec.extras = { "adag": [ - "cupy-cuda12x; sys_platform != 'darwin'", + "cupy-cuda12x>=13.2.0; sys_platform != 'darwin'", ], "client": [ # The Ray client needs a specific range of gRPC to work: From 4572cc3606a0ded1e4c7a6d5431cd035e2c3a5d2 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Mon, 12 Aug 2024 22:41:35 -0700 Subject: [PATCH 06/13] up Signed-off-by: Rui Qiao --- doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt | 2 +- python/requirements.txt | 2 +- python/requirements/ml/dl-cpu-requirements.txt | 2 +- python/requirements/ml/dl-gpu-requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt index c5c506930536..8d355ddc1770 100644 --- a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt +++ b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt @@ -91,7 +91,7 @@ contourpy==1.1.1 crc32c==2.3 crcmod==1.7 cryptography==38.0.1 -cupy-cuda12x==13.1.0 +cupy-cuda12x>=13.2.0 cycler==0.12.1 Cython==0.29.37 dask==2022.10.1 diff --git a/python/requirements.txt b/python/requirements.txt index 17647066114b..9a424939084b 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -8,7 +8,7 @@ ## setup.py install_requires click>=7.0 -cupy-cuda12x; sys_platform != 'darwin' +cupy-cuda12x>=13.2.0; sys_platform != 'darwin' filelock jsonschema msgpack<2.0.0,>=1.0.0 diff --git a/python/requirements/ml/dl-cpu-requirements.txt b/python/requirements/ml/dl-cpu-requirements.txt index 44f5f69aa810..7a5a8409dd04 100644 --- a/python/requirements/ml/dl-cpu-requirements.txt +++ b/python/requirements/ml/dl-cpu-requirements.txt @@ -26,4 +26,4 @@ torch-cluster==1.6.3 torch-spline-conv==1.2.2 torch-geometric==2.5.3 -cupy-cuda12x==13.1.0; sys_platform != 'darwin' +cupy-cuda12x>=13.2.0; sys_platform != 'darwin' diff --git a/python/requirements/ml/dl-gpu-requirements.txt b/python/requirements/ml/dl-gpu-requirements.txt index 59d6b0fb10df..ddfaab9b0ef5 100644 --- a/python/requirements/ml/dl-gpu-requirements.txt +++ b/python/requirements/ml/dl-gpu-requirements.txt @@ -15,4 +15,4 @@ torch-sparse==0.6.18+pt23cu121 torch-cluster==1.6.3+pt23cu121 torch-spline-conv==1.2.2+pt23cu121 -cupy-cuda12x==13.1.0; sys_platform != 'darwin' +cupy-cuda12x>=13.2.0; sys_platform != 'darwin' From 61468a3cbfa247deac7ac55a7102082cb8ded413 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 08:10:40 -0700 Subject: [PATCH 07/13] up Signed-off-by: Rui Qiao --- .buildkite/build.rayci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/build.rayci.yml b/.buildkite/build.rayci.yml index 1c9184c8b601..8c61a74a951b 100644 --- a/.buildkite/build.rayci.yml +++ b/.buildkite/build.rayci.yml @@ -46,6 +46,7 @@ steps: instance_type: medium commands: - bazel run //ci/ray_ci/doc:cmd_build + - sleep 18000 depends_on: docbuild job_env: docbuild-py3.12 From 715a2769d53ad6bb668858bbcd2df00269511aea Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 09:02:27 -0700 Subject: [PATCH 08/13] up Signed-off-by: Rui Qiao --- doc/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 3821acf2c121..4b45512ffa56 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -568,6 +568,7 @@ def setup(app): "aiohttp", "aiosignal", "composer", + "cupy", "dask", "datasets", "fastapi", From c0f1a33f4ed4fc920dfdc57533e283dc2ba74c0d Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 11:22:54 -0700 Subject: [PATCH 09/13] up Signed-off-by: Rui Qiao --- doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt | 2 +- python/ray/util/collective/requirements.txt | 2 +- python/requirements.txt | 2 +- python/requirements/ml/dl-cpu-requirements.txt | 2 +- python/requirements/ml/dl-gpu-requirements.txt | 2 +- python/setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt index 8d355ddc1770..c5c506930536 100644 --- a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt +++ b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt @@ -91,7 +91,7 @@ contourpy==1.1.1 crc32c==2.3 crcmod==1.7 cryptography==38.0.1 -cupy-cuda12x>=13.2.0 +cupy-cuda12x==13.1.0 cycler==0.12.1 Cython==0.29.37 dask==2022.10.1 diff --git a/python/ray/util/collective/requirements.txt b/python/ray/util/collective/requirements.txt index 59d2ac8473a5..a3b1d391a5d4 100644 --- a/python/ray/util/collective/requirements.txt +++ b/python/ray/util/collective/requirements.txt @@ -1 +1 @@ -cupy-cuda12x>=13.2.0; sys_platform != 'darwin' \ No newline at end of file +cupy-cuda12x; sys_platform != 'darwin' \ No newline at end of file diff --git a/python/requirements.txt b/python/requirements.txt index 9a424939084b..17647066114b 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -8,7 +8,7 @@ ## setup.py install_requires click>=7.0 -cupy-cuda12x>=13.2.0; sys_platform != 'darwin' +cupy-cuda12x; sys_platform != 'darwin' filelock jsonschema msgpack<2.0.0,>=1.0.0 diff --git a/python/requirements/ml/dl-cpu-requirements.txt b/python/requirements/ml/dl-cpu-requirements.txt index 7a5a8409dd04..5899db987b21 100644 --- a/python/requirements/ml/dl-cpu-requirements.txt +++ b/python/requirements/ml/dl-cpu-requirements.txt @@ -26,4 +26,4 @@ torch-cluster==1.6.3 torch-spline-conv==1.2.2 torch-geometric==2.5.3 -cupy-cuda12x>=13.2.0; sys_platform != 'darwin' +cupy-cuda12x; sys_platform != 'darwin' diff --git a/python/requirements/ml/dl-gpu-requirements.txt b/python/requirements/ml/dl-gpu-requirements.txt index ddfaab9b0ef5..672fb3adae52 100644 --- a/python/requirements/ml/dl-gpu-requirements.txt +++ b/python/requirements/ml/dl-gpu-requirements.txt @@ -15,4 +15,4 @@ torch-sparse==0.6.18+pt23cu121 torch-cluster==1.6.3+pt23cu121 torch-spline-conv==1.2.2+pt23cu121 -cupy-cuda12x>=13.2.0; sys_platform != 'darwin' +cupy-cuda12x; sys_platform != 'darwin' diff --git a/python/setup.py b/python/setup.py index a2009c5d01eb..0ae87994f856 100644 --- a/python/setup.py +++ b/python/setup.py @@ -230,7 +230,7 @@ def get_packages(self): pyarrow_dep = "pyarrow >= 6.0.1" setup_spec.extras = { "adag": [ - "cupy-cuda12x>=13.2.0; sys_platform != 'darwin'", + "cupy-cuda12x; sys_platform != 'darwin'", ], "client": [ # The Ray client needs a specific range of gRPC to work: From 2e11fc11ba681729a37aa90c65091e6f3fb0b5b5 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 11:26:58 -0700 Subject: [PATCH 10/13] up Signed-off-by: Rui Qiao --- python/ray/util/collective/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ray/util/collective/requirements.txt b/python/ray/util/collective/requirements.txt index a3b1d391a5d4..c1527a4385ad 100644 --- a/python/ray/util/collective/requirements.txt +++ b/python/ray/util/collective/requirements.txt @@ -1 +1 @@ -cupy-cuda12x; sys_platform != 'darwin' \ No newline at end of file +cupy-cuda12x From e428babcd0251fdf680fc8080053d51ca1f65e6f Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 13:02:02 -0700 Subject: [PATCH 11/13] up Signed-off-by: Rui Qiao --- .buildkite/build.rayci.yml | 1 - ci/ray_ci/doc/cmd_build.py | 9 --------- 2 files changed, 10 deletions(-) diff --git a/.buildkite/build.rayci.yml b/.buildkite/build.rayci.yml index 8c61a74a951b..1c9184c8b601 100644 --- a/.buildkite/build.rayci.yml +++ b/.buildkite/build.rayci.yml @@ -46,7 +46,6 @@ steps: instance_type: medium commands: - bazel run //ci/ray_ci/doc:cmd_build - - sleep 18000 depends_on: docbuild job_env: docbuild-py3.12 diff --git a/ci/ray_ci/doc/cmd_build.py b/ci/ray_ci/doc/cmd_build.py index 47d0831cfd02..3255398137f3 100644 --- a/ci/ray_ci/doc/cmd_build.py +++ b/ci/ray_ci/doc/cmd_build.py @@ -54,15 +54,6 @@ def _build(ray_checkout_dir): # We need to unset PYTHONPATH to use the Python from the environment instead of # from the Bazel runfiles. env.update({"PYTHONPATH": ""}) - try: - import numpy - - logger.info( - f"numpy version: {numpy.__version__}, type: {type(numpy.__version__)}" - ) - logger.info(f"test = {numpy.__version__ < '2'}") - except Exception as e: - logger.error(f"Failed to import numpy: {e}") subprocess.run( ["make", "html"], cwd=os.path.join(ray_checkout_dir, "doc"), From 0f966c4b2d69e9c02527b809d95e9df438e623da Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Tue, 13 Aug 2024 13:30:59 -0700 Subject: [PATCH 12/13] up Signed-off-by: Rui Qiao --- python/requirements/ml/dl-cpu-requirements.txt | 2 +- python/requirements/ml/dl-gpu-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/requirements/ml/dl-cpu-requirements.txt b/python/requirements/ml/dl-cpu-requirements.txt index 5899db987b21..44f5f69aa810 100644 --- a/python/requirements/ml/dl-cpu-requirements.txt +++ b/python/requirements/ml/dl-cpu-requirements.txt @@ -26,4 +26,4 @@ torch-cluster==1.6.3 torch-spline-conv==1.2.2 torch-geometric==2.5.3 -cupy-cuda12x; sys_platform != 'darwin' +cupy-cuda12x==13.1.0; sys_platform != 'darwin' diff --git a/python/requirements/ml/dl-gpu-requirements.txt b/python/requirements/ml/dl-gpu-requirements.txt index 672fb3adae52..59d6b0fb10df 100644 --- a/python/requirements/ml/dl-gpu-requirements.txt +++ b/python/requirements/ml/dl-gpu-requirements.txt @@ -15,4 +15,4 @@ torch-sparse==0.6.18+pt23cu121 torch-cluster==1.6.3+pt23cu121 torch-spline-conv==1.2.2+pt23cu121 -cupy-cuda12x; sys_platform != 'darwin' +cupy-cuda12x==13.1.0; sys_platform != 'darwin' From 15032b93ee90227b307d74f0419a43a1f634fdb6 Mon Sep 17 00:00:00 2001 From: Rui Qiao Date: Wed, 14 Aug 2024 00:03:40 -0700 Subject: [PATCH 13/13] up Signed-off-by: Rui Qiao --- python/ray/util/collective/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ray/util/collective/requirements.txt b/python/ray/util/collective/requirements.txt index c1527a4385ad..ce5057b221f1 100644 --- a/python/ray/util/collective/requirements.txt +++ b/python/ray/util/collective/requirements.txt @@ -1 +1 @@ -cupy-cuda12x +cupy-cuda100 \ No newline at end of file