diff --git a/README.rst b/README.rst index 30c1682c3..ee025cb38 100644 --- a/README.rst +++ b/README.rst @@ -158,7 +158,7 @@ RLlib Quick Start .. code-block:: bash pip install tensorflow # or tensorflow-gpu - pip install "ray[rllib]" # also recommended: ray[debug] + pip install "ray[rllib]" .. code-block:: python diff --git a/doc/examples/cython/ray-project/requirements.txt b/doc/examples/cython/ray-project/requirements.txt index 43eabb232..8755fced6 100644 --- a/doc/examples/cython/ray-project/requirements.txt +++ b/doc/examples/cython/ray-project/requirements.txt @@ -1,2 +1,2 @@ -ray[debug] +ray scipy diff --git a/doc/examples/lbfgs/ray-project/requirements.txt b/doc/examples/lbfgs/ray-project/requirements.txt index dc3a91b64..f740f42b6 100644 --- a/doc/examples/lbfgs/ray-project/requirements.txt +++ b/doc/examples/lbfgs/ray-project/requirements.txt @@ -1 +1 @@ -ray[debug,rllib] +ray[rllib] diff --git a/doc/examples/newsreader/ray-project/requirements.txt b/doc/examples/newsreader/ray-project/requirements.txt index 9040cd6cc..b9f0e9c76 100644 --- a/doc/examples/newsreader/ray-project/requirements.txt +++ b/doc/examples/newsreader/ray-project/requirements.txt @@ -1,3 +1,3 @@ -ray[debug] +ray atoma flask diff --git a/doc/examples/streaming/ray-project/requirements.txt b/doc/examples/streaming/ray-project/requirements.txt index 99bbe32ce..bec8c5bdc 100644 --- a/doc/examples/streaming/ray-project/requirements.txt +++ b/doc/examples/streaming/ray-project/requirements.txt @@ -1,2 +1,2 @@ -ray[debug] +ray wikipedia diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 9fb2edd7c..d0bc818bd 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -15,7 +15,7 @@ You can install the latest official version of Ray as follows. Official releases .. code-block:: bash - pip install -U ray # also recommended: ray[debug] + pip install -U ray **Note for Windows Users:** To use Ray on Windows, Visual C++ runtime must be installed (see :ref:`Windows Dependencies ` section). If you run into any issues, please see the :ref:`Windows Support ` section. diff --git a/doc/source/ray-overview/index.rst b/doc/source/ray-overview/index.rst index 25a007d9a..afff2b69c 100644 --- a/doc/source/ray-overview/index.rst +++ b/doc/source/ray-overview/index.rst @@ -196,7 +196,7 @@ RLlib Quick Start .. code-block:: bash pip install tensorflow # or tensorflow-gpu - pip install ray[rllib] # also recommended: ray[debug] + pip install ray[rllib] .. code-block:: python diff --git a/doc/source/rllib.rst b/doc/source/rllib.rst index 79db9095f..984622f27 100644 --- a/doc/source/rllib.rst +++ b/doc/source/rllib.rst @@ -23,7 +23,7 @@ RLlib has extra dependencies on top of ``ray``. First, you'll need to install ei .. code-block:: bash - pip install 'ray[rllib]' # also recommended: ray[debug] + pip install 'ray[rllib]' Then, you can try out training in the following equivalent ways: diff --git a/python/ray/autoscaler/aws/example-ml.yaml b/python/ray/autoscaler/aws/example-ml.yaml index c2564c954..972dc0082 100644 --- a/python/ray/autoscaler/aws/example-ml.yaml +++ b/python/ray/autoscaler/aws/example-ml.yaml @@ -120,7 +120,7 @@ setup_commands: # has your Ray repo pre-cloned. Then, you can replace the pip installs # below with a git checkout (and possibly a recompile). - source activate pytorch_p36 && pip install -U ray - - source activate pytorch_p36 && pip install -U ray[rllib] ray[tune] ray[debug] + - source activate pytorch_p36 && pip install -U ray[rllib] ray[tune] ray # Consider uncommenting these if you also want to run apt-get commands during setup # - sudo pkill -9 apt-get || true # - sudo pkill -9 dpkg || true diff --git a/python/ray/memory_monitor.py b/python/ray/memory_monitor.py index 74bfee681..9381c5064 100644 --- a/python/ray/memory_monitor.py +++ b/python/ray/memory_monitor.py @@ -91,7 +91,7 @@ class MemoryMonitor: if not psutil: logger.warn("WARNING: Not monitoring node memory since `psutil` " "is not installed. Install this with " - "`pip install psutil` (or ray[debug]) to enable " + "`pip install psutil` to enable " "debugging of memory-related crashes.") def get_memory_usage(self): diff --git a/python/ray/scripts/scripts.py b/python/ray/scripts/scripts.py index bed882c5a..913aaeda7 100644 --- a/python/ray/scripts/scripts.py +++ b/python/ray/scripts/scripts.py @@ -1290,7 +1290,7 @@ def stack(): COMMAND = """ pyspy=`which py-spy` if [ ! -e "$pyspy" ]; then - echo "ERROR: Please 'pip install py-spy' (or ray[debug]) first" + echo "ERROR: Please 'pip install py-spy' first" exit 1 fi # Set IFS to iterate over lines instead of over words. diff --git a/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt index 0f026d879..e02756318 100644 --- a/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt +++ b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt @@ -1 +1 @@ -ray[debug] \ No newline at end of file +ray diff --git a/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt index 0f026d879..e02756318 100644 --- a/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt +++ b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt @@ -1 +1 @@ -ray[debug] \ No newline at end of file +ray diff --git a/python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt b/python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt index 0f026d879..e02756318 100644 --- a/python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt +++ b/python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt @@ -1 +1 @@ -ray[debug] \ No newline at end of file +ray diff --git a/python/ray/tune/progress_reporter.py b/python/ray/tune/progress_reporter.py index a45ac238d..a71a2da54 100644 --- a/python/ray/tune/progress_reporter.py +++ b/python/ray/tune/progress_reporter.py @@ -460,7 +460,7 @@ def memory_debug_str(): round(used_gb, 1), round(total_gb, 1), warn) except ImportError: return ("Unknown memory usage. Please run `pip install psutil` " - "(or ray[debug]) to resolve)") + "to resolve)") def _get_trials_by_state(trials: List[Trial]): diff --git a/python/setup.py b/python/setup.py index 2c82ad1d9..7069f57e9 100644 --- a/python/setup.py +++ b/python/setup.py @@ -95,7 +95,6 @@ ray_files += [ # also update the matching section of requirements.txt # in this directory extras = { - "debug": [], "serve": [ "uvicorn", "flask", "requests", "pydantic<1.7", "dataclasses; python_version < '3.7'" diff --git a/release/rllib_tests/regression_tests/run.sh b/release/rllib_tests/regression_tests/run.sh index abbabcb04..f965f35f7 100755 --- a/release/rllib_tests/regression_tests/run.sh +++ b/release/rllib_tests/regression_tests/run.sh @@ -46,7 +46,7 @@ wheel="https://s3-us-west-2.amazonaws.com/ray-wheels/$ray_branch/$commit/ray-$ra conda uninstall -y terminado pip install -U pip pip install -U "$wheel" -pip install "ray[rllib]" "ray[debug]" +pip install "ray[rllib]" "ray" pip install terminado pip install torch==1.6 torchvision pip install boto3==1.4.8 cython==0.29.0 diff --git a/release/rllib_tests/stress_tests/run.sh b/release/rllib_tests/stress_tests/run.sh index 704d013a7..c5c1eb676 100755 --- a/release/rllib_tests/stress_tests/run.sh +++ b/release/rllib_tests/stress_tests/run.sh @@ -47,7 +47,7 @@ wheel="https://s3-us-west-2.amazonaws.com/ray-wheels/$ray_branch/$commit/ray-$ra conda uninstall -y terminado pip install -U pip pip install -U "$wheel" -pip install "ray[rllib]" "ray[debug]" +pip install "ray[rllib]" "ray" pip install terminado pip install boto3==1.4.8 cython==0.29.0 diff --git a/release/rllib_tests/unit_gpu_tests/requirements.txt b/release/rllib_tests/unit_gpu_tests/requirements.txt index e63556bc1..4f8897539 100644 --- a/release/rllib_tests/unit_gpu_tests/requirements.txt +++ b/release/rllib_tests/unit_gpu_tests/requirements.txt @@ -1,5 +1,5 @@ ray[rllib] -ray[debug] +ray torch==1.6+cu101 torchvision==0.7.0+cu101 boto3==1.4.8 diff --git a/release/stress_tests/requirements.txt b/release/stress_tests/requirements.txt index 0f026d879..e02756318 100644 --- a/release/stress_tests/requirements.txt +++ b/release/stress_tests/requirements.txt @@ -1 +1 @@ -ray[debug] \ No newline at end of file +ray