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

LB cleanup #2392

Merged
merged 340 commits into from Mar 2, 2019
Merged

LB cleanup #2392

merged 340 commits into from Mar 2, 2019

Conversation

KaiSzuttor
Copy link
Member

@KaiSzuttor KaiSzuttor commented Nov 30, 2018

Fixes #2357. Fixes #2356. Fixes #2491. Fixes #2517

TODOs:

  • coupling seed interface
  • philox for CPU LB fluid
  • fluid seed checkpointing

@codecov
Copy link

codecov bot commented Nov 30, 2018

Codecov Report

Merging #2392 into python will decrease coverage by <1%.
The diff coverage is 73%.

Impacted file tree graph

@@           Coverage Diff           @@
##           python   #2392    +/-   ##
=======================================
- Coverage      75%     75%    -1%     
=======================================
  Files         483     494    +11     
  Lines       28269   28097   -172     
=======================================
- Hits        21376   21231   -145     
+ Misses       6893    6866    -27
Impacted Files Coverage Δ
src/core/grid_based_algorithms/lb.cpp 91% <ø> (+12%) ⬆️
src/core/unit_tests/periodic_fold_test.cpp 100% <ø> (ø) ⬆️
src/core/communication.hpp 100% <ø> (ø) ⬆️
src/core/cuda_interface.cpp 81% <ø> (-14%) ⬇️
src/core/utils/Vector.hpp 100% <ø> (ø) ⬆️
src/core/observables/LBVelocityProfile.hpp 100% <ø> (ø) ⬆️
...e/virtual_sites/VirtualSitesInertialessTracers.cpp 100% <ø> (ø) ⬆️
src/core/statistics.hpp 80% <ø> (ø) ⬆️
src/core/rotation.cpp 97% <ø> (-1%) ⬇️
src/core/particle_data.hpp 97% <ø> (ø) ⬆️
... and 59 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 882c058...ae12ecf. Read the comment docs.

CMakeLists.txt Outdated Show resolved Hide resolved
src/core/grid_based_algorithms/lb.cpp Outdated Show resolved Hide resolved
src/core/grid_based_algorithms/lb.cpp Show resolved Hide resolved
src/core/grid_based_algorithms/lbgpu_cuda.cu Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
@RudolfWeeber
Copy link
Contributor

RudolfWeeber commented Nov 30, 2018 via email

@KaiSzuttor
Copy link
Member Author

We plan to update bee anyway before Christmas, this PR will anyway be not ready for merge before that.

@KaiSzuttor
Copy link
Member Author

src/core/forces.cpp Outdated Show resolved Hide resolved
src/core/initialize.cpp Outdated Show resolved Hide resolved
src/core/integrate.cpp Outdated Show resolved Hide resolved
src/core/rotation.cpp Outdated Show resolved Hide resolved
src/core/forces.cpp Outdated Show resolved Hide resolved
@fweik
Copy link
Contributor

fweik commented Mar 1, 2019

Please check all includes, some are suspicious, like in rotation.hpp

@KaiSzuttor
Copy link
Member Author

I did

@fweik
Copy link
Contributor

fweik commented Mar 1, 2019

core/global.cpp:#include "grid_based_algorithms/lattice.hpp"
core/forces.cpp:#include "grid_based_algorithms/electrokinetics.hpp"
core/forces.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/forces.cpp:#include "grid_based_algorithms/lb_particle_coupling.hpp"
core/rotation.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/communication.cpp:#include "grid_based_algorithms/lb.hpp"
core/communication.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/communication.cpp:#include "grid_based_algorithms/lb_interpolation.hpp"
core/communication.cpp:#include "grid_based_algorithms/lb_particle_coupling.hpp"
core/statistics.cpp:#include "grid_based_algorithms/lb.hpp"
core/statistics.cpp:#include "grid_based_algorithms/lbgpu.hpp"
python/espressomd/electrokinetics.pxd:    cdef extern from "grid_based_algorithms/electrokinetics.hpp":
script_interface/lbboundaries/LBBoundaries.hpp:#include "core/grid_based_algorithms/lbboundaries.hpp"
script_interface/lbboundaries/LBBoundary.hpp:#include "core/grid_based_algorithms/lbboundaries/LBBoundary.hpp"
python/espressomd/lb.pxd:    cdef extern from "grid_based_algorithms/lb_interface.hpp":
python/espressomd/lb.pxd:    cdef extern from "grid_based_algorithms/lb_particle_coupling.hpp":
python/espressomd/lb.pxd:    cdef extern from "grid_based_algorithms/lbgpu.hpp":
python/espressomd/lb.pxd:    cdef extern from "grid_based_algorithms/lb_interpolation.hpp":
core/integrate.cpp:#include "grid_based_algorithms/electrokinetics.hpp"
core/integrate.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/integrate.cpp:#include "grid_based_algorithms/lb_particle_coupling.hpp"
core/initialize.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/initialize.cpp:#include "grid_based_algorithms/lbboundaries.hpp"
core/thermostat.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/object-in-fluid/oif_global_forces.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/observables/LBVelocityProfile.cpp:#include "grid_based_algorithms/lattice.hpp"
core/observables/LBVelocityProfile.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/observables/LBVelocityProfile.cpp:#include "grid_based_algorithms/lb_interpolation.hpp"
core/virtual_sites/VirtualSitesInertialessTracers.cpp:#include "grid_based_algorithms/lattice.hpp"
core/virtual_sites/lb_inertialess_tracers_cuda.cu:#include "grid_based_algorithms/lbboundaries.hpp"
core/virtual_sites/lb_inertialess_tracers_cuda.cu:#include "grid_based_algorithms/lbgpu.cuh"
core/virtual_sites/lb_inertialess_tracers_cuda.cu:#include "grid_based_algorithms/lbgpu.hpp"
core/observables/CylindricalLBVelocityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lattice.hpp"
core/observables/CylindricalLBVelocityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/observables/CylindricalLBVelocityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lb_interpolation.hpp"
core/virtual_sites/lb_inertialess_tracers.cpp:#include "grid_based_algorithms/lb.hpp"
core/virtual_sites/lb_inertialess_tracers.cpp:#include "grid_based_algorithms/lbboundaries.hpp"
core/observables/CylindricalLBVelocityProfile.cpp:#include "grid_based_algorithms/lattice.hpp"
core/observables/CylindricalLBVelocityProfile.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/observables/CylindricalLBVelocityProfile.cpp:#include "grid_based_algorithms/lb_interpolation.hpp"
core/observables/CylindricalLBFluxDensityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lattice.hpp"
core/observables/CylindricalLBFluxDensityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lb_interface.hpp"
core/observables/CylindricalLBFluxDensityProfileAtParticlePositions.cpp:#include "grid_based_algorithms/lb_interpolation.hpp"
core/unit_tests/lb-d3q19.cpp:#include "grid_based_algorithms/lb-d3q19.hpp"

@fweik
Copy link
Contributor

fweik commented Mar 1, 2019

e.g. why are

core/statistics.cpp:#include "grid_based_algorithms/lb.hpp"
core/statistics.cpp:#include "grid_based_algorithms/lbgpu.hpp"

needed?

Copy link
Contributor

@RudolfWeeber RudolfWeeber left a comment

Choose a reason for hiding this comment

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

Huge improvement. Thanks alot for doing this work, Kai.

@KaiSzuttor
Copy link
Member Author

I see no non-trivial way of removing the communication LB dependency but I cleaned up some of the other includes.

@espressomd espressomd deleted a comment from espresso-ci Mar 1, 2019
@espressomd espressomd deleted a comment from espresso-ci Mar 1, 2019
@KaiSzuttor KaiSzuttor merged commit 7670d39 into espressomd:python Mar 2, 2019
@KaiSzuttor KaiSzuttor deleted the lb_cleanup branch March 2, 2019 06:13
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.

None yet

6 participants