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.

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

Integrate main into RB-2.3 branch and update library version #1918

Conversation

doug-walker
Copy link
Collaborator

This PR implements the 2.3.1 release for the RB-2.3 branch.

I decided to take all of the commits since 2.3.0 since they are all bug fixes or build enhancements with nothing to break ABI compatibility.

markreidvfx and others added 25 commits December 6, 2023 18:41
Signed-off-by: Mark Reid <mindmark@gmail.com>
(cherry picked from commit 16b3157)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
* Remove unused includes

Signed-off-by: Mark Reid <mindmark@gmail.com>

* Use neon hardware support for f16 conversions

Signed-off-by: Mark Reid <mindmark@gmail.com>

* Add some small neon optimizations
use blendv,floor and fma intrinsics were possible

Signed-off-by: Mark Reid <mindmark@gmail.com>

---------

Signed-off-by: Mark Reid <mindmark@gmail.com>
(cherry picked from commit 14f0afa)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…on#1848)

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 87126fa)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 381d1fc)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…eFoundation#1861)

Signed-off-by: Chongyun Lee <uchkks@protonmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit c429400)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…ftwareFoundation#1855)

In v1 of OCIO FileTransforms are able to load .cc files
without specifying a cccid. In v2 this broke causing an
exception to be raised instead of using the first cc found
in the file.

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit c7ad353)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…#1873)

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
(cherry picked from commit dddbee0)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
* Curve inspector improvements

- Move README to root app folder
- Change curve inspector grid to always render as a square with 10 segments.
- Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough.

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Improve log range calculation

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Improve channel sample comparison

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update src/apps/ocioview/ocioview/inspect/curve_inspector.py

Signed-off-by: Michael Dolan <michdolan@gmail.com>

Co-authored-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Michael Dolan <michdolan@gmail.com>

---------

Signed-off-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 8add374)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…Foundation#1886)

Add the missing assignment of the the default view transform when a config is copied using the equal operator

Signed-off-by: Michael De Caria <decariamichael@gmail.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit bc8569b)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…Foundation#1882)

Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 1fad466)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: AbhineshJha <abhinesh_223002@saitm.org>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 0d00b2c)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…reFoundation#1853)

* PySide 6, remove imath, add imageio support

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Remove Imath

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Support imageio as fallback for openimageio

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Further adjustments following latest updates

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Fix pixel probe

Signed-off-by: Remi Achard <remiachard@gmail.com>

Add OpenColorIO to requirements

Signed-off-by: Remi Achard <remiachard@gmail.com>

* Fix rebase issue

Signed-off-by: Remi Achard <remiachard@gmail.com>

---------

Signed-off-by: Remi Achard <remiachard@gmail.com>
Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Signed-off-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
(cherry picked from commit 45544ce)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…e. (AcademySoftwareFoundation#1888)

* Issue AcademySoftwareFoundation#1874 Cast to unsigned char for isspace.

Signed-off-by: pylee <penne.y.lee@intel.com>

* Add unit test.

Signed-off-by: pylee <penne.y.lee@intel.com>

* Add test comment as suggested in code review.

Signed-off-by: pylee <penne.y.lee@intel.com>

---------

Signed-off-by: pylee <penne.y.lee@intel.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ed85207)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…mySoftwareFoundation#1890)

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit b94a184)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…AcademySoftwareFoundation#1896)

* Skip processor concatenation if the display view transform is also data.

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>

* Moved missing display color space exception before processor creation.

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>

---------

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 52b4965)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…on#1899)

* Restore GPU workflow runs

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Enable undefined behaviour sanitizer

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix SIMD option for platform_latest

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix install_docs_env on CI workflow (not used at the moment)

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix OpenEXR build flag

Signed-off-by: Rémi Achard <remiachard@gmail.com>

---------

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 382dcb6)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 9078753)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…ndation#1902)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ffd0f70)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 4d64b32)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 4f4f30e)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 41441bb)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
…demySoftwareFoundation#1913)

* Improve heuristics

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

* Add some comments

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

---------

Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit d8852b5)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
@remia
Copy link
Collaborator

remia commented Dec 7, 2023

I think we need #1849 for version 2.3.1, otherwise sounds good to me.

…areFoundation#1849)

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ba2b41e)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
@doug-walker
Copy link
Collaborator Author

There are some understandable Actions fails. The Windows Wheel failures seem to be caused by Chocalatey download problems, similar to previous fails, though they worked on the previous commit. The Platform Latest Linux compilation error only affects one of the command-line tools and is not a blocker since the Linux CI passes.

Going ahead to merge this and get the release out.

@doug-walker doug-walker merged commit 92db29b into AcademySoftwareFoundation:RB-2.3 Dec 8, 2023
60 of 70 checks passed
@doug-walker doug-walker deleted the walker-cherrypick-231 branch December 8, 2023 01:02
@doug-walker
Copy link
Collaborator Author

The Windows Wheels now pass, so that was a download issue, as suspected.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet