Fix size_t issues across JPEG versions and platforms #4439
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
fmassa
approved these changes
Sep 17, 2021
| // For windows backward compatibility, we define JpegSizeType as different types | ||
| // according to the libjpeg version used, in order to prevent compilation | ||
| // errors. | ||
| #if defined(_WIN32) || !defined(JPEG_LIB_VERSION_MAJOR) || \ |
There was a problem hiding this comment.
No more Windows checks? Ok with me, but IIUC there used to be discrepancies between Windows / Linux libjpeg that we might need to take into account?
There was a problem hiding this comment.
The situation seems to have been resolved in later versions of Windows (9d>=) hence blunt windows filter needs to go. I'll pin different versions of JPEG in a bit to see what exactly is the right condition we should use here.
|
All CI tests green when unpinned, except of |
datumbox
changed the title
datumbox
added a commit
to datumbox/vision
that referenced
this pull request
Sep 17, 2021
facebook-github-bot
pushed a commit
that referenced
this pull request
Sep 30, 2021
Summary: * Windows use size_t * Temporarily pin jpeg <=9b * Temporarily pin jpeg ==9c * Remove pinning. Reviewed By: datumbox Differential Revision: D31268029 fbshipit-source-id: 6d6514abe195e71f05996fee7e4e1be7fad4a137
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 (again) the size_t issues we've been facing due to JPEG. It seems that overnight, the version on windows changed from
9b-hb83a4c4_2to9d-h2bbff1b_0. It seems that the Windows version has fixed the issue from 9d>= and aligned itself with the ones of the rest of the platforms.To ensure that our patch works with all versions, I pinned and tested jpeg on the following versions:
We skip tests for
jpeg ==9cbecause we getUnsatisfiable dependencieserrors in conda.