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

Split CMake RDC utilities from Celeritas macros #1104

Merged
merged 18 commits into from
Feb 14, 2024

Conversation

pcanal
Copy link
Contributor

@pcanal pcanal commented Feb 12, 2024

No description provided.

@pcanal pcanal self-assigned this Feb 12, 2024
@pcanal pcanal changed the title cmake: Use cuda_rdc_\* for CUDA relocatable device code support cmake: Use cuda_rdc_* for CUDA relocatable device code support Feb 12, 2024
@sethrj sethrj changed the title cmake: Use cuda_rdc_* for CUDA relocatable device code support Split CMake RDC utilities from Celeritas macros Feb 12, 2024
cmake/CeleritasUtils.cmake Outdated Show resolved Hide resolved
cmake/CeleritasUtils.cmake Outdated Show resolved Hide resolved
@sethrj sethrj added core Software engineering infrastructure minor Minor internal changes or fixes labels Feb 12, 2024
cmake/CeleritasUtils.cmake Outdated Show resolved Hide resolved
cmake/CeleritasUtils.cmake Outdated Show resolved Hide resolved
@pcanal pcanal requested a review from sethrj February 13, 2024 16:40
Copy link
Member

@sethrj sethrj left a comment

Choose a reason for hiding this comment

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

LGTM, hope the CI passes :) Thanks @pcanal !


#-----------------------------------------------------------------------------#
message(AUTHOR_WARNING "Deprecated file. Please use CeleritasUtils.cmake")
Copy link
Member

Choose a reason for hiding this comment

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

Actually, don't we want people to only include CudaRdcUtils and use cuda_rdc_add_library? We don't want downstream code to add celeritas-specific aliases.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, that would be better. In this case we don't need to distribute CeleritasUtils.mk but need to update the examples.

@sethrj
Copy link
Member

sethrj commented Feb 14, 2024

@pcanal for backward compatibility I've completed ab1834e ... hopefully it works!

@sethrj
Copy link
Member

sethrj commented Feb 14, 2024

@pcanal looks like there's one final issue; not sure why, but the wrapper functions aren't propagating "target includes" for the installed target:

/__w/celeritas/celeritas/example/minimal/minimal.cc:9:10: fatal error: celeritas/Constants.hh: No such file or directory
    9 | #include <celeritas/Constants.hh>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~

@pcanal
Copy link
Contributor Author

pcanal commented Feb 14, 2024

I am looking into it.

cmake/CeleritasUtils.cmake Outdated Show resolved Hide resolved
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
@sethrj
Copy link
Member

sethrj commented Feb 14, 2024

This is where the investment we've spent into CI really pays off... we've had to make like 10 changes to get build, install, test, downstream build working!

Copy link
Member

@sethrj sethrj left a comment

Choose a reason for hiding this comment

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

Finally it all works!

@sethrj sethrj merged commit fb03216 into celeritas-project:develop Feb 14, 2024
20 checks passed
@pcanal pcanal deleted the to_cuda_rdc_cmake branch October 18, 2024 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Software engineering infrastructure minor Minor internal changes or fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants