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.

Sign up for GitHub

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

Jump to bottom

Gpu gain example #132

Merged
merged 23 commits into from
Mar 9, 2024
Merged

Gpu gain example #132

merged 23 commits into from
Mar 9, 2024

Conversation

garyo
Copy link
Contributor

@garyo garyo commented Nov 27, 2023

No description provided.

garyo added 6 commits November 26, 2023 13:28
@garyo
Initial commit of BlacMagic Gain GPU example
016586e 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Update Gain GPU example Makefile and XCode project
ac32cba 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Add GPU properties to Support lib
1fae973 
Per changes from Blackmagic Design

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Update GPU Gain example to build with latest support libs
1894a34 
Also update support lib to handle CUDA/OpenCL/Metal render properties
and processing functions.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Rename example GainPlugin to GPUGain for clarity
56ff21a 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Update GPUGain example to build with CMake on Mac
c79c504 
MacOS isn't hard; just add Metal frameworks to the link.
Linux and Windows will still need work, to link with CUDA.

Also fixed the Support include dir in `Examples/CMakeLists.txt`.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo garyo added this to the Release 1.5 milestone Nov 27, 2023
@garyo garyo requested a review from john-paulsmith November 27, 2023 21:38
@garyo garyo self-assigned this Nov 27, 2023
@garyo garyo force-pushed the gpu-gain-example branch 5 times, most recently from 7c0601b to 7a6ed2a Compare December 29, 2023 15:06
@garyo
CI CUDA install: try to make it smaller to avoid disk-space issue
c5e920e 
Github CI runners have only ~14GB free space. CUDA takes a lot.
Using the "network" method with only a subset of packages may help.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Fix non-CUDA builds
4c5fec7 
Signed-off-by: Gary Oberbrunner <[email protected]>
garyo added 3 commits December 29, 2023 10:38
@garyo
CUDA builds: compile for all known major architectures
a63c6ae 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Add a non-CUDA Windows CI build
c0b3c55 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
CI: Install plugins into artifact
b9ded56 
Also add install step to build-cmake.sh. You can override the install
dir via `-DPLUGIN_INSTALLDIR=/any/absolute/path`.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo garyo marked this pull request as ready for review December 29, 2023 17:33
@garyo garyo requested a review from SonyDennisAdams January 2, 2024 16:13
@SonyDennisAdams
Add OpenCL Image support to the updated GPU rendering extension:
db1c87a 
* Modify ofxGPURender.h to support OpenCL Images
* Add kOfxImageEffectActionBeginSequenceRender and kOfxImageEffectActionEndSequenceRender as required actions for some CUDA/Metal/OpenCL properties where they were not listed
* Also make documentation edits in the same header
* Modify GPUGain example to also support OpenCL Images and show how to disambiguate in the case where a plug-in supports both OpenCL Buffers and OpenCL Images

Signed-off-by: Dennis Adams <[email protected]>
@SonyDennisAdams
Copy link
Contributor

The build folder structure for GPUGain does not match the other examples:
build\Examples\GPUGain\Release\example-GPUGain.ofx. <= different than the rest
build\Examples\Release\example-Basic.ofx
build\Examples\Release\example-Custom.ofx
build\Examples\Release\example-DepthConverter.ofx
build\Examples\Release\example-Invert.ofx
build\Examples\Release\example-OpenGL.ofx
build\Examples\Release\example-Rectangle.ofx
build\Examples\Release\example-Test.ofx

@garyo garyo requested review from fxtech and revisionfx February 11, 2024 13:05
@garyo
Copy link
Contributor Author

garyo commented Feb 11, 2024

Also see #140 from @SonyDennisAdams

garyo added 3 commits February 24, 2024 17:01
@garyo
Merge pull request #140 from AcademySoftwareFoundation/gpu-gain-openc…
e18fd49 
…l-images

Add OpenCL Image support to the updated GPU rendering extension:
@garyo
Merge branch 'main' into gpu-gain-example
8d2dda6 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Move GPUGain example into Support/Plugins: it uses support lib
c298169 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Copy link
Contributor Author

garyo commented Feb 25, 2024

GPUGain location should be fixed by c298169 (once it builds in CI)

garyo added 4 commits February 25, 2024 11:55
@garyo
Fix CI build of GPUGain: add CUDA and Metal sources properly
1955cbc 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Fix examples Info.plist generation
b33a6ad 
Also clean up formatting of CMakeLists.txt and cmake/OpenFX.cmake
using `cmake-format`.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Add missing file from last commit
3685719 
Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo
Clean up examples' names & effect groups & catch GPU render prop exce…
a450fa5 
…ptions

Now all examples go into "OpenFX Examples" or "OpenFX
Examples (Support)" as they should.

Natron wouldn't load GPU Gain due to an exception on load due to host
properties not found, so I added code to trap and log those.

Signed-off-by: Gary Oberbrunner <[email protected]>
@SonyDennisAdams
Copy link
Contributor

@garyo
OpenCL Buffer and Image support confirmed on Windows and Mac. The build option OFX_SUPPORTS_OPENCLRENDER is OFF by default, but needs to be ON for this example to work. Also, on Mac in Support/Plugins/CMakeLists.txt I had to add "-framework OpenCL" otherwise I got link errors against the OpenCL host API (e.g., clBuildProgram).

SonyDennisAdams
SonyDennisAdams previously approved these changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@SonyDennisAdams SonyDennisAdams left a comment

Choose a reason for hiding this comment

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

I confirmed Windows and Mac OpenCL Buffer and Image support work

@garyo
Turn on OPENCL on Mac & link support examples w/ OpenCL framework
1b6861b 
Thanks for the review comments from @SonyDennisAdams.

Signed-off-by: Gary Oberbrunner <[email protected]>
@garyo garyo merged commit eb626d9 into main Mar 9, 2024
9 checks passed
@revisionfx
Copy link
Contributor

Another company just asked me why this is in Support but not in Examples folder?

Pierre

@garyo
Copy link
Contributor Author

garyo commented Apr 8, 2024

This example was created by Blackmagic, who generously donated it to us. It uses the C++ support lib. An example that doesn't use the support lib would be very welcome.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SonyDennisAdams SonyDennisAdams SonyDennisAdams left review comments

@john-paulsmith john-paulsmith Awaiting requested review from john-paulsmith

@fxtech fxtech Awaiting requested review from fxtech

@revisionfx revisionfx Awaiting requested review from revisionfx

Assignees

@garyo garyo

Labels
None yet
Projects
TSC Meeting Agenda
Status: Completed
Milestone
Release 1.5
Development

Successfully merging this pull request may close these issues.
3 participants
@garyo @SonyDennisAdams @revisionfx