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

Make sirius compatible with libxc 7 #1025

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Make sirius compatible with libxc 7 #1025

merged 3 commits into from
Nov 5, 2024

Conversation

mtaillefumier
Copy link
Collaborator

  • Libxc 7 introduces a breaking change in their header file. The xc functionals are now defined in a separate header file xc_funcs.h that is not included by default in xc.h.
  • Apply formatting

@mtaillefumier mtaillefumier requested review from toxa81 and simonpintarelli and removed request for toxa81 November 2, 2024 10:46
@mtaillefumier
Copy link
Collaborator Author

apply-format.x does not seem to format the code correctly on my machine....

@toxa81
Copy link
Collaborator

toxa81 commented Nov 2, 2024

apply-format.x does not seem to format the code correctly on my machine....

Probably because behaviour of clang-format is slightly different from version to version. You need to use llvm@17.0.4. Also, format should not be applied to files that are untouched in the current PR.

BTW, is the change backwards compatible with libxc-6.x?

@mtaillefumier
Copy link
Collaborator Author

mtaillefumier commented Nov 4, 2024

It is compatible with libxc 6. The missing header file is surrounded by a #if statement. I also did not change the spack recipe so if we enforce libxc 6 (which I think we should keep for the time being) then we are safe.

This reverts commit 72cf92b.
@simonpintarelli
Copy link
Collaborator

The change regarding libxc looks good to me. We should revert the formatting commit and fix .clang-format afterwards. I'm getting the same diff, some changes look fine, others not, for example the indent in the python bindings.

@mtaillefumier
Copy link
Collaborator Author

The change regarding libxc looks good to me. We should revert the formatting commit and fix .clang-format afterwards. I'm getting the same diff, some changes look fine, others not, for example the indent in the python bindings.

Oh, I only use the apply-format script. Something is definitely wrong. I will revert the patch.

@simonpintarelli
Copy link
Collaborator

I'm trying to figure out what has changed in clang-format, one option which apparently changed defaults is AlignTrailingComments.

Copy link
Collaborator

@simonpintarelli simonpintarelli left a comment

Choose a reason for hiding this comment

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

lgtm

@simonpintarelli simonpintarelli merged commit 1e73cf6 into develop Nov 5, 2024
3 checks passed
@toxa81 toxa81 deleted the fix_libxc_7 branch November 7, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants