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

Resolve noinline definition conflict between CUDA headerfiles and GCC 12 libraries #4814

Merged
merged 2 commits into from
Nov 3, 2023

Conversation

ye-luo
Copy link
Contributor

@ye-luo ye-luo commented Nov 3, 2023

Proposed changes

Fix the include conflict described in #4761

What type(s) of changes does this code introduce?

  • Bugfix

Does this introduce a breaking change?

  • No

What systems has this change been tested on?

epyc-server

Checklist

  • Yes. This PR is up to date with current the current state of 'develop'

@ye-luo
Copy link
Contributor Author

ye-luo commented Nov 3, 2023

Test this please

@prckent prckent changed the title Simple fix resolving noinline defintion conflict between CUDA headerfiles and GCC. Resolve noinline definition conflict between CUDA headerfiles and GCC 12 libraries Nov 3, 2023
Copy link
Contributor

@prckent prckent left a comment

Choose a reason for hiding this comment

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

Lets go with this brittle fix until/if it proves problematic.

Will approve after fix is confirmed.

@markdewing
Copy link
Contributor

Interchanging the include files worked on my system.

@ye-luo
Copy link
Contributor Author

ye-luo commented Nov 3, 2023

Test this please

@prckent prckent enabled auto-merge November 3, 2023 20:14
@prckent prckent merged commit 252da53 into QMCPACK:develop Nov 3, 2023
23 checks passed
@ye-luo ye-luo deleted the fix-clang-offload-gcc12 branch November 3, 2023 23:39
ye-luo added a commit to ye-luo/qmcpack that referenced this pull request Sep 11, 2024
ye-luo added a commit to ye-luo/qmcpack that referenced this pull request Sep 11, 2024
@ye-luo ye-luo mentioned this pull request Sep 11, 2024
ye-luo added a commit to ye-luo/qmcpack that referenced this pull request Sep 11, 2024
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