Skip to content

Use source code in hash where possible (fix #2089) #2090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertnishihara merged 3 commits into from
May 18, 2018
Merged

Use source code in hash where possible (fix #2089) #2090

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56f7ef1
Use source code in hash where possible (fix #2089)
AdamGleave May 18, 2018
56a36b6
Compatibility with Python<3.3
AdamGleave May 18, 2018
b199f5b
Fix for cython functions.
robertnishihara May 18, 2018
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: 8 additions & 17 deletions python/ray/remote_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
DEFAULT_REMOTE_FUNCTION_MAX_CALLS = 0


def in_ipython():
"""Return true if we are in an IPython interpreter and false otherwise."""
try:
__IPYTHON__
return True
except NameError:
return False


def compute_function_id(function):
"""Compute an function ID for a function.

Expand All @@ -36,14 +27,14 @@ def compute_function_id(function):
# Include the function module and name in the hash.
function_id_hash.update(function.__module__.encode("ascii"))
function_id_hash.update(function.__name__.encode("ascii"))
# If we are running a script or are in IPython, include the source code in
# the hash. If we are in a regular Python interpreter we skip this part
# because the source code is not accessible. If the function is a built-in
# (e.g., Cython), the source code is not accessible.
import __main__ as main
if (hasattr(main, "__file__") or in_ipython()) \
and inspect.isfunction(function):
function_id_hash.update(inspect.getsource(function).encode("ascii"))
try:
# If we are running a script or are in IPython, include the source code
# in the hash.
source = inspect.getsource(function).encode("ascii")
function_id_hash.update(source)
except (IOError, OSError, TypeError):
# Source code may not be available: e.g. Cython or Python interpreter.
pass
# Compute the function ID.
function_id = function_id_hash.digest()
assert len(function_id) == 20
Expand Down