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

initial commit for simple self-contained cuda example #1280

Merged

Conversation

anderslanglands
Copy link
Contributor

Description

This PR adds a simple, self-contained example as a test case called 'example-cuda'. It's basically just a stripped down version of testshade, wrapped up so that one could copy it out of tree and get it building as a standalone example with minimal changes to the CMakeLists.txt. I'm submitting this as I just started looking at OSL in CUDA recently and this is the example I would have loved to have started from.

This example is pure CUDA rather than OptiX, but I'd like to do a matching OptiX version at some point.

Tests

It is a test :)

Checklist:

  • I have read the contribution guidelines.
  • I have previously submitted a Contributor License Agreement.
  • I have updated the documentation, if applicable.
  • I have ensured that the change is tested somewhere in the testsuite (adding new test cases if necessary).
  • My code follows the prevailing code style of this project.

include(check_is_enabled)
include(checked_find_package)

find_package(OSL REQUIRED)
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can use checked_find_package for all of these

Copy link
Collaborator

@lgritz lgritz left a comment

Choose a reason for hiding this comment

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

LGTM. This is a great addition, Anders.

@lgritz
Copy link
Collaborator

lgritz commented Oct 31, 2020

I'm ready to merge whenever you let me know you've worked it all out with your company and they are clear with you that this work is covered by the CLA they've already signed.

@anderslanglands
Copy link
Contributor Author

anderslanglands commented Nov 3, 2020 via email

@lgritz
Copy link
Collaborator

lgritz commented Nov 3, 2020

For OSL, email CLAs to [email protected], for OIIO mail to [email protected].

@lgritz
Copy link
Collaborator

lgritz commented Nov 6, 2020

CLA received.

Anders, can you please rebase this on top of the current master and then do a push --force? I think the CI failures are all things unrelated to your change, which have already been fixed. But I'd love to see a fully passed CI so we know there's not a problem lurking in this patch being masked by the other failures.

add copyright and rename headers to fit project convention

remove rend_lib bytecode from build

remove optix includes
@anderslanglands
Copy link
Contributor Author

anderslanglands commented Nov 6, 2020 via email

@lgritz
Copy link
Collaborator

lgritz commented Nov 6, 2020

Don't worry about the appveyor. I should just kill that entirely.

@lgritz lgritz merged commit 06ce3d0 into AcademySoftwareFoundation:master Nov 6, 2020
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