Skip to content
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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 15, 2018
Merged

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

merged 2 commits into from
Jun 15, 2018

Conversation

ruanjiandong
Copy link
Contributor

…ork.so to avoid symbol conflict

@ruanjiandong ruanjiandong mentioned this pull request Jun 14, 2018
Closed
@allenlavoie allenlavoie self-assigned this Jun 14, 2018
allenlavoie
allenlavoie previously approved these changes Jun 14, 2018
View reviewed changes
Copy link
Member

@allenlavoie allenlavoie left a comment

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 approved these changes Jun 14, 2018
View reviewed changes
Copy link
Member

@allenlavoie allenlavoie left a comment

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
Reviewers

@allenlavoie allenlavoie allenlavoie approved these changes

Assignees

@allenlavoie allenlavoie

@caisq caisq

Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ruanjiandong @allenlavoie @googlebot @caisq @kokoro-team