lsmo-epfl / aiida-lsmo

AiiDA workflows for the LSMO laboratory at EPFL
Other
9 stars 13 forks source link

Fix eigenvalues parser for CP2K v9 #98

Closed mbercx closed 2 years ago

mbercx commented 2 years ago

Fix/simplify the eigenvalue parsing for CP2K v9. The main change is the following:

re.search(r'eached convergence', line):

since Reached is not capitalized anymore in CP2K v9. Other changes are related to formatting and putting an upper limit on markupsafe<2.1 since the latest release broke the docs build.

mpougin commented 2 years ago

thanks a lot for your input @mbercx. By coincidence, I am currently running cp2k-9 calculations with aiida, so I will test your suggested changes πŸ‘

mbercx commented 2 years ago

thanks a lot for your input @mbercx. By coincidence, I am currently running cp2k-9 calculations with aiida, so I will test your suggested changes πŸ‘

What a wonderful coincidence! I will eagerly await your feedback, then! ^^

mpougin commented 2 years ago

hello @mbercx, I am sure you will be delighted to hear that I couldn't have done it better myself, your changes passed my critical testing. It is working fine now for CP2K-8.1 and CP2K-9. @yakutovicha could you please merge the branch?

codecov-commenter commented 2 years ago

Codecov Report

Merging #98 (14819c9) into develop (0999cce) will increase coverage by 0.09%. The diff coverage is 27.02%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop      #98      +/-   ##
===========================================
+ Coverage    70.61%   70.71%   +0.09%     
===========================================
  Files           34       34              
  Lines         2808     2800       -8     
===========================================
- Hits          1983     1980       -3     
+ Misses         825      820       -5     
Impacted Files Coverage Ξ”
aiida_lsmo/workchains/isotherm_accurate.py 18.62% <3.57%> (+0.07%) :arrow_up:
aiida_lsmo/parsers/parser_functions.py 84.10% <100.00%> (+1.42%) :arrow_up:

Continue to review full report at Codecov.

Legend - Click here to learn more Ξ” = absolute <relative> (impact), ΓΈ = not affected, ? = missing data Powered by Codecov. Last update 0999cce...14819c9. Read the comment docs.

yakutovicha commented 2 years ago

hey, looks like the pre-commit check is not happy. @mbercx can you please fix that?

mbercx commented 2 years ago

@mbercx can you please fix that?

Eh, sure. Just have to figure out where I actually cloned the package again. πŸ˜“

mbercx commented 2 years ago

@yakutovicha seems I need you to cut a release for aiida-cp2k to fix this, since the addition of the third input argument for _parse_bands was added after the 1.3.0 release:

https://github.com/aiidateam/aiida-cp2k/commit/61d4927c9074524a97da207230fcddd053597eec

Once it's out I'll update the dependencies here and the pre-commit should be fixed.

@mpougin are you running the develop version of aiida-cp2k? Else I'd say _parse_bands should raise an error. Or you're not running calculations that call that parser, of course. :)

mpougin commented 2 years ago

thank you again @mbercx for your contribution here. Yes, you're right, I am running the develop version but not using _parse_bands at the moment ;)

yakutovicha commented 2 years ago

I will make the cp2k release today. Well, I will try my best.

mbercx commented 2 years ago

waitng

yakutovicha commented 2 years ago

waitng

sorry Marnik.

yakutovicha commented 2 years ago

I am in the progress of making a release: https://github.com/aiidateam/aiida-cp2k/pull/150. Tests failed ( Β―\_(ツ)_/Β―), so tomorrow I am going to fix them and then I release the plugin.

mpougin commented 2 years ago

thanks @yakutovicha :)

yakutovicha commented 2 years ago

released: 1.4.0

mbercx commented 2 years ago

Thanks @yakutovicha! To reciprocate I've also prepared a release for aiida-quantumespresso, but our automatic deployment on PyPI seems to be failing, sadly. We'll try to fix it asap!

mbercx commented 2 years ago

They passed! Praise be! πŸ₯³

yakutovicha commented 2 years ago

As requested earlier, I am merging the branch :)

mbercx commented 2 years ago

But... I updated the OP with a nice commit message 😭

yakutovicha commented 2 years ago

But... I updated the OP with a nice commit message 😭

sorry, man

mbercx commented 2 years ago

sorry, man

Haha, no biggie πŸ˜‰