Skip to content
This repository has been archived by the owner on Sep 28, 2021. It is now read-only.

libecpint integration #588

Merged
merged 38 commits into from
Feb 8, 2021
Merged

libecpint integration #588

merged 38 commits into from
Feb 8, 2021

Conversation

junghans
Copy link
Member

@junghans junghans commented Nov 2, 2020

Ultimately fix #567

@junghans
Copy link
Member Author

junghans commented Nov 2, 2020

Let's see if we have it everywhere.

@codecov
Copy link

codecov bot commented Nov 2, 2020

Codecov Report

Merging #588 (62a8388) into master (d03d97c) will decrease coverage by 1.9%.
The diff coverage is 72.0%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #588     +/-   ##
========================================
- Coverage    53.2%   51.2%   -2.0%     
========================================
  Files         296     294      -2     
  Lines       27937   26759   -1178     
========================================
- Hits        14866   13722   -1144     
+ Misses      13071   13037     -34     
Impacted Files Coverage Δ
include/votca/xtp/aomatrix.h 71.4% <ø> (ø)
include/votca/xtp/aopotential.h 57.1% <0.0%> (-26.2%) ⬇️
src/libxtp/aomatrices/aotransform.cc 86.8% <ø> (ø)
src/libxtp/dftengine/dftengine.cc 71.4% <0.0%> (+0.1%) ⬆️
src/libxtp/ecpbasisset.cc 61.1% <0.0%> (-1.0%) ⬇️
src/libxtp/jobtopology.cc 0.0% <0.0%> (ø)
src/libxtp/aomatrices/aoecp.cc 73.0% <72.0%> (-23.8%) ⬇️
src/libxtp/ecpaobasis.cc 73.7% <72.9%> (-0.3%) ⬇️
src/libxtp/aoshell.cc 94.5% <90.0%> (-0.2%) ⬇️
include/votca/xtp/aoshell.h 100.0% <100.0%> (ø)
... and 5 more

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 d03d97c...62a8388. Read the comment docs.

@junghans
Copy link
Member Author

junghans commented Nov 3, 2020

Works now, @rubengerritsen @JensWehner I leave the actual work for you guys!

@JensWehner
Copy link
Member

@junghans Thanks for the help. We will make it work. :)

@junghans junghans changed the title cmake: search for libecpint libecpint integration Nov 22, 2020
@JensWehner
Copy link
Member

@votca-bot format

@junghans
Copy link
Member Author

@votca-bot copyright

@JensWehner
Copy link
Member

this works locally but atm is blocked by robashaw/libecpint#26

@JensWehner
Copy link
Member

I think that is the libecpint memory leak

@JensWehner
Copy link
Member

@votca-bot format

@JensWehner JensWehner marked this pull request as ready for review January 28, 2021 20:29
@JensWehner
Copy link
Member

@rubengerritsen As the new libecpint release is up, this can be merged soon. Do you want to review?

@JensWehner
Copy link
Member

@votca-bot format

CMakeLists.txt Outdated Show resolved Hide resolved
Co-authored-by: Christoph Junghans <junghans@votca.org>
CMakeLists.txt Outdated Show resolved Hide resolved
Co-authored-by: Christoph Junghans <junghans@votca.org>
@@ -50,6 +50,13 @@ pkg_check_modules(LIBXC REQUIRED IMPORTED_TARGET libxc)
if(NOT TARGET PkgConfig::LIBINT)
pkg_check_modules(LIBINT REQUIRED IMPORTED_TARGET libint2>=2.6)
endif()
find_package(ecpint REQUIRED)
Copy link
Member Author

Choose a reason for hiding this comment

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

Not right now, but later (next week?), we should required version 1.5 here.

Copy link
Member

Choose a reason for hiding this comment

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

1.0.5? Actually we should require it now, because all the tests segfault otherwise.

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, fedora and opensuse didn't receive the 1.0.5 package yet. https://bodhi.fedoraproject.org/updates/FEDORA-2021-5464f657f7 will need 7 more days.

Copy link
Member Author

@junghans junghans Feb 5, 2021

Choose a reason for hiding this comment

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

But Fedora and openSUSE have v1.0.4 with your patch.

Copy link
Member Author

@junghans junghans Feb 5, 2021

Choose a reason for hiding this comment

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

Ok, there is another bug in libecpint (see /robashaw/libecpint/issues/31), that prevents it from exporting the right version in the cmake target, so there is nothing we can right now.

Copy link
Member Author

Choose a reason for hiding this comment

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

We can required 1.0.6 once robashaw/libecpint#32 is through. ;-)

Copy link
Member

Choose a reason for hiding this comment

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

okay

@JensWehner
Copy link
Member

@rubengerritsen this can be reviewed. :)

@JensWehner JensWehner merged commit 3ec71e8 into master Feb 8, 2021
@JensWehner JensWehner deleted the libecpint branch February 8, 2021 13:31
votca-bot added a commit to votca/votca that referenced this pull request Feb 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ECP integrals via library
4 participants