[INTEL MKL] Fixes for regressions in unit tests. #31955
Merged
Conversation
This file contains 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
alextp
approved these changes
Aug 26, 2019
| from tensorflow.python import pywrap_tensorflow | ||
| from tensorflow.python import _pywrap_utils |
There was a problem hiding this comment.
The linter will likely complain here; disable it
There was a problem hiding this comment.
@alextp Thanks for approving the PR. Pylint did not report any warnings in our internal testing for this line and it also passed in the Ubuntu sanity tests. Let me know if I need to update this PR.
| from tensorflow.python import pywrap_tensorflow | ||
| from tensorflow.python import _pywrap_utils |
tensorflow-bot
bot
added
kokoro:force-run
|
Hi @gbaned, it looks like the PR is stuck at importing. Can you check the status? |
tensorflow-copybara
pushed a commit
that referenced
this pull request
Aug 28, 2019
PiperOrigin-RevId: 265920757
tensorflow-copybara
pushed a commit
that referenced
this pull request
Oct 22, 2019
… swig. This is part of a larger effort to deprecate swig and eventually with modularization break pywrap_tensorflow into smaller components. It will also make exporting C++ ops to Python significantly easier. XLA is using the pybind11 macros already. Please refer to https://github.com/tensorflow/community/blob/master/rfcs/20190208-pybind11.md for more information. We are adding `toco::` to the exported namespaces for pywrap_tensorflow's shared object. A few downstream modules also require a previous import of pywrap tensorflow, because the wrapper depends on the shared library. See #31955 for additional information. PiperOrigin-RevId: 276096778 Change-Id: I042f488c36b00818b2344fb39c36cad97cee6eb8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes a number of regressions caused by this commit da3f7b1 when MKL DNN is enabled.
pywrap_tensorflow depends on a number of prebuilt shared libraries when MKL DNN is enabled, so importing of _pywrap_utils fails if pywrap_tensorflow has not already been imported. Fixed this by switching the order of imports or adding imports of pywrap_tensorflow when needed.