Fix Apple Universal 2 (arm64/x86_64) builds #854
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
meshula
approved these changes
Oct 16, 2020
…arm64 macOS" This reverts commit 67053eb. Signed-off-by: Harry Mallon <[email protected]>
* In these types of builds we want arm64 and x86_64 (with AVX optimisations). However the way cmake works (with `CMAKE_OSX_ARCHITECTURES="arm64;x86_64"` means that we share one OpenEXRConfigInternal.h between both builds. So we have to have OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX mean "AVX GCC asm is available if platform is x86", rather than "AVX GCC asm is available". Then we decide on AVX optimisations based on that #define and also the platform defines. Signed-off-by: Harry Mallon <[email protected]>
hjmallon
force-pushed
the
pr.universal2
branch
from
c07e119 to
6abd091
Compare
|
I have fixed the sign-off. Cheers. |
|
@kdt3rd Kimball, would you mind giving this a once over? A second set of eyes would be great, I want to make sure there isn't some weird platform permutation that I haven't thought of. |
lgritz
approved these changes
Oct 22, 2020
|
Perhaps a new point release soon with this? This fixes universal build support for the macOS platform, which is a quite significant change. |
|
We'll discuss this at the next steering committee meeting.
Thanks,
- Cary
…On Fri, Nov 27, 2020 at 2:07 PM Greg Cotten ***@***.***> wrote:
Perhaps a new point release soon with this? This fixes universal build
support for the macOS platform, which is a quite significant change.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#854 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AFC3DGMJVWYCMFZTVNCA6OTSSAPI5ANCNFSM4STFWALQ>
.
--
Cary Phillips | R&D Supervisor | ILM | San Francisco
|
|
We'll plan a 2.5.4 release with this and some other fixes, but won't likely be able to make it before early January. The 3.0 release will likely come later in January. |
|
Makes sense! hopefully it will be "re-fixed" for the 3.0 release, as well. Re-opened the issue here. |
|
@cary-ilm Did this make it into 2.5.4? Update: seems like it didn't! |
|
Unfortunately, this did not make it into 2.5.4, my apologies, that was my
oversight. We'll put out a 2.5.5 release within a few days that includes
this and some other minor fixes. There is one outstanding issue #890 that
we'd like to resolve first.
…On Fri, Jan 29, 2021 at 12:14 PM Greg Cotten ***@***.***> wrote:
@cary-ilm <https://github.com/cary-ilm> Did this make it into 2.5.4?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#854 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AFC3DGK734F3MLNJJOQTRTLS4MJKDANCNFSM4STFWALQ>
.
--
Cary Phillips | R&D Supervisor | ILM | San Francisco
|
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Mar 17, 2021
## Version 2.5.5 (February 12, 2021) Patch release with various bug/sanitizer/security fixes, primarily related to reading corrupted input files, but also a fix for universal build support on macOS. Specific OSS-fuzz issues include: * OSS-fuzz [#30291](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30291) * OSS-fuzz [#29106](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29106) * OSS-fuzz [#28971](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28971) * OSS-fuzz [#29829](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29829) * OSS-fuzz [#30121](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30121) ### Merged Pull Requests * [#914](AcademySoftwareFoundation/openexr#914) additional verification of DWA data sizes * [#910](AcademySoftwareFoundation/openexr#910) update tileoffset sanitycheck to handle ripmaps * [#903](AcademySoftwareFoundation/openexr#903) prevent overflows by using Int64 for all vars in DWA initialize * [#901](AcademySoftwareFoundation/openexr#901) Use size_t for DWA buffersize calculation * [#897](AcademySoftwareFoundation/openexr#897) prevent overflow in RgbaFile cachePadding * [#896](AcademySoftwareFoundation/openexr#896) add buffer size validation to FastHuf decode * [#893](AcademySoftwareFoundation/openexr#893) Include <limits> where required by newer compilers * [#889](AcademySoftwareFoundation/openexr#889) Add explicit #include <limits> for numeric_limits * [#854](AcademySoftwareFoundation/openexr#854) Fix Apple Universal 2 (arm64/x86_64) builds
cary-ilm
added a commit
to cary-ilm/openexr
that referenced
this pull request
May 7, 2021
…ation#854 Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
that referenced
this pull request
May 7, 2021
Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
to cary-ilm/openexr
that referenced
this pull request
May 13, 2021
…ation#854 (AcademySoftwareFoundation#1011) Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
to cary-ilm/openexr
that referenced
this pull request
May 17, 2021
…ation#854 (AcademySoftwareFoundation#1011) Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
that referenced
this pull request
May 17, 2021
Signed-off-by: Cary Phillips <[email protected]>
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.
The earlier change #772 is no longer required on recent betas od Xcode (I used Xcode 12.2 beta2), so that is reverted. Also this reconfigures how the config define for AVX works so that ARM64 and x86_64 can be built with the same config header (as required by cmake universal builds).