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

Prep for dependencies 9.0.0 alpha 1 #267

Merged
merged 17 commits into from
Aug 27, 2024

Conversation

murraystevenson
Copy link
Contributor

This is a round of updates in preparation for a 9.0.0 alpha dependencies release intended on moving us towards a final set of dependencies for the Gaffer 1.5 release. This PR contains the Cycles 4.2 updates from #266 without OIDN as there have been reports on that PR of collisions with Arnold's OIDN which will require further investigation on Windows. As we want to get started on testing the rest of these updates in advance of the Gaffer 1.5 release, this PR drops OIDN for the time being.

Aside from updates, this PR also includes a few macOS and CI related fixes and workarounds.

Of note: OIIO has been updated to 2.5.10.1, and while there are newer OIIO versions, we run into an error running OSL 1.12 in batched mode when using OIIO 2.5.11.0 or newer:

ERROR: gafferDependencies-9.0.0a1-linux/lib/lib_b8_AVX2_noFMA_oslexec.so could not be loaded with error "gafferDependencies-9.0.0a1-linux/lib/lib_b8_AVX2_noFMA_oslexec.so: undefined symbol: _ZN9OSL_v1_127Strings3rgbE"
LLVM_Util::call_function(osl_b8_AVX2_noFMA_get_attribute_s, args), requested function name doesn't exist in the current module!

It may be that this is already resolved with OSL 1.13. An OSL update would require some changes on the Gaffer side to handle the RendererServices ustring -> ustringhash changes plus whatever else needs to be tackled there. This would be better handled in a future dependencies 9.0.0 alpha update...

We don't list OpenVDB in `dependencies` so a full clean build will build OIIO without OpenVDB support, though building OIIO with a `buildDir` that already contains OpenVDB would build OIIO with OpenVDB support so for consistency we also disable it here.
OIIO 2.5 requires LibJPEG-Turbo >= 2.1 as it now relies on its exported cmake configs
@murraystevenson murraystevenson self-assigned this Aug 27, 2024
Copy link
Member

@johnhaddon johnhaddon left a comment

Choose a reason for hiding this comment

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

Thanks Murray! It's so nice to have CI working for this so we can see at a glance that it all works.

Changes.md Outdated
@@ -14,6 +14,7 @@
- PySide : Updated to version 5.15.14.
- Qt : Updated to version 5.15.14.
- USD : Updated to version 24.08.
- Zstd : Added version 1.5.0.
Copy link
Member

Choose a reason for hiding this comment

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

The "marketing name" used on the website seems to be "Zstandard", so I think maybe that's how we should refer to it (in the filename as well)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cool, squashed in a rename to "Zstandard". Will go ahead and merge this in order to get a 9.0.0a1 release out today for further testing.

Download the same file from a mirror URL as we've been seeing intermittent download failures from ftp.gnome.org
Python builds on macOS attempt to install Python Launcher.app and IDLE.app to /Applications. The github provided macos-14 image already includes an install of Python 3.10, which causes our Python 3.10 build to fail as it cannot overwrite `/Applications/Python 3.10/Python Launcher.app` and `/Applications/Python 3.10/IDLE.app`. There appears to be no obvious way to configure our build to not install to /Applications, so we instead remove these conflicting paths for now...
The github macos-14 runner image provides it, which then causes our LibRaw builds to treat it as a dependency. We have no need for little-cms2 so we make sure to remove it.
@murraystevenson murraystevenson merged commit 98e51e4 into GafferHQ:main Aug 27, 2024
2 checks passed
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.

2 participants