Skip to content

Cycles : Update to 5.1.0 with even sample motion blur patches#298

Open
boberfly wants to merge 1 commit intoGafferHQ:mainfrom
boberfly:cycles510Update
Open

Cycles : Update to 5.1.0 with even sample motion blur patches#298
boberfly wants to merge 1 commit intoGafferHQ:mainfrom
boberfly:cycles510Update

Conversation

@boberfly
Copy link
Copy Markdown
Contributor

I was able to upstream the type_names() from Brecht however it isn't using the tagged release but rather the release/v5.1 branch link just to note.

https://projects.blender.org/blender/cycles/src/branch/release/v5.1/

I don't use gafferDependencies anymore and haven't fully tested the build process, they did quite a bit of cmake changes so I suspect this may not build out of the box fully.

I have changes for Gaffer to go with this as well coming.

@johnhaddon
Copy link
Copy Markdown
Member

it isn't using the tagged release but rather the release/v5.1 branch link just to note

So the build might change from one day to the next if something changes on that branch? If so, we can't accept that - we need dependencies builds to be completely repeatable. Maybe you can tie it to a specific commit by SHA?

How does this branch relate to the official 5.1 release anyway? Is it where maintenance will be done for patch versions? And is a tag for a patch likely to appear before we release 1.7?

@boberfly
Copy link
Copy Markdown
Contributor Author

Hey @johnhaddon

The difference is just that type_names() patch added - I had it as a regular patch here against the tagged version, would that be preferred over the hash key representation? Agreed it could change later down the line.

@johnhaddon
Copy link
Copy Markdown
Member

I don't mind if type_names() comes from a patch or from the Cycles branch, as long as the Cycles commit we download is fixed - so either SHA without patch or tag with patch works for me.

@murraystevenson
Copy link
Copy Markdown
Contributor

@boberfly, the macOS build failure here looks to be a missing #include <arm_neon.h> in Cycles 5.1. This patch fixes it, but seems this would be better addressed upstream in Cycles itself...

@boberfly
Copy link
Copy Markdown
Contributor Author

@murraystevenson I have an SSE2NEON/config.py that I could bring over to this for macOS silicon if you'd like?

@boberfly
Copy link
Copy Markdown
Contributor Author

Ok I added SSE2NEON in there, @murraystevenson I needed to use -D SSE2NEON_ROOT_DIR={buildDir} as I have it located somewhere else but it might just get detected because it's all in the same directory. I can add your patch too if this doesn't address it, I'm guess it is still needed?

@boberfly
Copy link
Copy Markdown
Contributor Author

BitstreamVera mirror failing again? Argg... :)

@murraystevenson
Copy link
Copy Markdown
Contributor

@boberfly the BitstreamVera mirror is back online so I reran CI. It looks like the newly added type_names() patch is incomplete so the Cycles build is now failing on both Linux and macOS.

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.

3 participants