Skip to content

opencv interop fix: exclude libjpeg symbols from libtensorflow_framew… - #19966

Merged
allenlavoie merged 2 commits into
tensorflow:masterfrom
ruanjiandong:opencv_interop_fix
Jun 15, 2018
Merged

allenlavoie merged 2 commits into
tensorflow:masterfrom
ruanjiandong:opencv_interop_fix

Conversation

@ruanjiandong

Copy link
Copy Markdown
Contributor

…ork.so to avoid symbol conflict

allenlavoie
allenlavoie previously approved these changes Jun 14, 2018

@allenlavoie allenlavoie left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat! Looks good to me. It'd be nice to have this on MacOS too, but we can follow up if/when someone complains.

(Assuming the tests pass. It does look like we re-export most symbols under tensorflow::jpeg::*, so it seems fine)

@allenlavoie allenlavoie added the kokoro:force-run Tests on submitted change label Jun 14, 2018
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jun 14, 2018
@allenlavoie
allenlavoie dismissed stale reviews from ghost and themself via 21c9526 June 14, 2018 22:59

@allenlavoie allenlavoie left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed a linter issue so we can see if the substantive tests pass.

@allenlavoie allenlavoie added the kokoro:force-run Tests on submitted change label Jun 14, 2018
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jun 14, 2018
@allenlavoie
allenlavoie merged commit e657014 into tensorflow:master Jun 15, 2018
@ruanjiandong
ruanjiandong deleted the opencv_interop_fix branch June 15, 2018 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants