Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
Fix _is_tensorflow_array.#30114
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
+43 −38
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
78 changes: 40 additions & 38 deletionslib/matplotlib/cbook.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -2331,42 +2331,56 @@ | ||
def _is_torch_array(x): | ||
"""Return whether *x* is a PyTorch Tensor.""" | ||
try: | ||
#We're intentionally not attempting to import torch. If somebody | ||
# has created a torch array, torch should already be in sys.modules. | ||
tp = sys.modules.get("torch").Tensor | ||
except AttributeError: | ||
return False # Module not imported or a nonstandard module with no Tensor attr. | ||
return (isinstance(tp, type) #Just in case it's a very nonstandard module. | ||
timhoffm marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
and isinstance(x, tp)) | ||
def _is_jax_array(x): | ||
"""Return whether *x* is a JAX Array.""" | ||
try: | ||
# We're intentionally not attempting to import jax. If somebody | ||
# has created a jax array, jax should already be in sys.modules. | ||
tp = sys.modules.get("jax").Array | ||
except AttributeError: | ||
return False # Module not imported or a nonstandard module with no Array attr. | ||
return (isinstance(tp, type) # Just in case it's a very nonstandard module. | ||
and isinstance(x, tp)) | ||
def _is_pandas_dataframe(x): | ||
"""Check if *x* is a Pandas DataFrame.""" | ||
try: | ||
# We're intentionally not attempting to import Pandas. If somebody | ||
# has created a Pandas DataFrame, Pandas should already be in sys.modules. | ||
tp = sys.modules.get("pandas").DataFrame | ||
except AttributeError: | ||
return False # Module not imported or a nonstandard module with no Array attr. | ||
return (isinstance(tp, type) # Just in case it's a very nonstandard module. | ||
and isinstance(x, tp)) | ||
def _is_tensorflow_array(x): | ||
"""Return whether *x* is a TensorFlow Tensor or Variable.""" | ||
try: | ||
# We're intentionally not attempting to import TensorFlow. If somebody | ||
# has created a TensorFlow array, TensorFlow should already be in | ||
# sys.modules we use `is_tensor` to not depend on the class structure | ||
# of TensorFlow arrays, as `tf.Variables` are not instances of | ||
# `tf.Tensor` (they both convert the same way). | ||
is_tensor = sys.modules.get("tensorflow").is_tensor | ||
except AttributeError: | ||
return False | ||
try: | ||
return is_tensor(x) | ||
except Exception: | ||
return False # Just in case it's a very nonstandard module. | ||
def _unpack_to_numpy(x): | ||
@@ -2421,15 +2435,3 @@ | ||
return fmt % (value,) | ||
except (TypeError, ValueError): | ||
return fmt.format(value) | ||
3 changes: 3 additions & 0 deletionslib/matplotlib/tests/test_cbook.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.