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

clang-format: format cu files #3011

Merged
merged 1 commit into from
Jan 28, 2022

Conversation

vicentebolea
Copy link
Collaborator

@vicentebolea vicentebolea commented Jan 19, 2022

I tested that this still format C,C++ files by intentionally adding a commit which introduce format mistakes. The checks for that commit is here:

https://github.com/ornladios/ADIOS2/pull/3011/checks?sha=20ad1d499df3b051d0543bce71c7b3c4a717cfbb

@vicentebolea vicentebolea force-pushed the clang-format-cuda branch 2 times, most recently from 20ad1d4 to d07587c Compare January 19, 2022 20:58
@vicentebolea
Copy link
Collaborator Author

ping @chuckatkins

@anagainaru
Copy link
Contributor

#3013 is using the previous style for the cuda example file. Just something to consider when we merge the two PRs

@vicentebolea
Copy link
Collaborator Author

@anagainaru yes, this should then go first to master, and later after you rebase you can call this script (ADIOS2/scripts/ci/scripts/run-clang-format.sh) to format your CUDA files

@anagainaru
Copy link
Contributor

anagainaru commented Jan 24, 2022

@vicentebolea Or you could remove the updates to the cuda file from this PR, what is really needed is only the style file
and I will merge my PR only after I use the style file

@vicentebolea
Copy link
Collaborator Author

@anagainaru the problem with that is that then this Pull request CI format test will not pass.

@vicentebolea
Copy link
Collaborator Author

you could do a rebase with -Xours to default to my changes here in case of conflict to resolve the conflicts.

@vicentebolea vicentebolea requested review from JasonRuonanWang and removed request for chuckatkins January 28, 2022 00:18
@vicentebolea vicentebolea merged commit cc8cc26 into ornladios:master Jan 28, 2022
@vicentebolea vicentebolea deleted the clang-format-cuda branch January 28, 2022 01:25
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