Remove unnecessary handling of setproctitle and psutil. (#7702)

This commit is contained in:
Robert Nishihara 2020-03-22 22:06:42 -07:00 committed by GitHub
parent 4d722bf003
commit 8b4c2b7e88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 27 deletions

View file

@ -48,7 +48,7 @@ if [[ "$platform" == "linux" ]]; then
$PYTHON_EXE "$TEST_SCRIPT"
# Run the UI test to make sure that the packaged UI works.
$PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle
$PIP_CMD install -q aiohttp google grpcio requests
$PYTHON_EXE "$UI_TEST_SCRIPT"
# Check that the other wheels are present.
@ -88,7 +88,7 @@ elif [[ "$platform" == "macosx" ]]; then
if (( $(echo "$PY_MM >= 3.0" | bc) )); then
# Run the UI test to make sure that the packaged UI works.
$PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle
$PIP_CMD install -q aiohttp google grpcio requests
$PYTHON_EXE "$UI_TEST_SCRIPT"
fi

View file

@ -11,11 +11,9 @@ opencv-python-headless
pandas
pickle5
pygments
psutil
pyyaml
recommonmark
redis
setproctitle
sphinx
sphinx-click
sphinx-copybutton

View file

@ -158,13 +158,6 @@ via pip.
pip install ray[dashboard]
If you are using Anaconda and have trouble installing ``psutil`` or
``setproctitle``, the try
.. code-block:: bash
conda install psutil setproctitle
The command ``ray.init()`` or ``ray start --head`` will print out the address of
the dashboard. For example,

View file

@ -41,10 +41,8 @@ class RayTaskError(RayError):
"""Initialize a RayTaskError."""
if proctitle:
self.proctitle = proctitle
elif setproctitle:
self.proctitle = setproctitle.getproctitle()
else:
self.proctitle = "ray_worker"
self.proctitle = setproctitle.getproctitle()
self.pid = pid or os.getpid()
self.ip = ip or ray.services.get_node_ip_address()
self.function_name = function_name

View file

@ -1102,7 +1102,7 @@ def start_dashboard(require_webui,
webui_dependencies_present = False
warning_message = (
"Failed to start the dashboard. The dashboard requires Python 3 "
"as well as 'pip install aiohttp psutil setproctitle grpcio'.")
"as well as 'pip install aiohttp grpcio'.")
if require_webui:
raise ImportError(warning_message)
else:

View file

@ -677,12 +677,6 @@ def init(address=None,
else:
driver_mode = SCRIPT_MODE
if setproctitle is None:
logger.warning(
"WARNING: Not updating worker name since `setproctitle` is not "
"installed. Install this with `pip install setproctitle` "
"(or ray[debug]) to enable monitoring of worker processes.")
if global_worker.connected:
if ignore_reinit_error:
logger.error("Calling ray.init() again after it has already been "
@ -1142,8 +1136,7 @@ def connect(node,
job_id = JobID.nil()
# TODO(qwang): Rename this to `worker_id_str` or type to `WorkerID`
worker.worker_id = _random_string()
if setproctitle:
setproctitle.setproctitle("ray::IDLE")
setproctitle.setproctitle("ray::IDLE")
elif mode is LOCAL_MODE:
if job_id is None:
job_id = JobID.from_int(random.randint(1, 65535))
@ -1369,11 +1362,9 @@ def disconnect(exiting_interpreter=False):
@contextmanager
def _changeproctitle(title, next_title):
if setproctitle:
setproctitle.setproctitle(title)
setproctitle.setproctitle(title)
yield
if setproctitle:
setproctitle.setproctitle(next_title)
setproctitle.setproctitle(next_title)
def register_custom_serializer(cls,