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

fixes #2326 #2354

Merged
merged 3 commits into from
Oct 31, 2018
Merged

fixes #2326 #2354

merged 3 commits into from
Oct 31, 2018

Conversation

itischler
Copy link
Contributor

Fixes #2326

Description of changes:

  • removed ifdef LB_GPU so that LB_ELECTROHYRODYNAMICS can be used without GPU

PR Checklist

  • Tests?
    • Interface
    • Core
  • Docs?

Copy link
Member

@KaiSzuttor KaiSzuttor left a comment

Choose a reason for hiding this comment

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

although LB_ELECTROHYDRODYNAMICS implies LB, we should guard correctly. Thus: #ifdef LB_ELECTROHYDRODYNAMICS && ( defined(LB) || defined(LB_GPU))

@codecov
Copy link

codecov bot commented Oct 30, 2018

Codecov Report

Merging #2354 into python will increase coverage by <1%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           python   #2354    +/-   ##
=======================================
+ Coverage      71%     71%   +<1%     
=======================================
  Files         381     381            
  Lines       18905   18905            
=======================================
+ Hits        13567   13587    +20     
+ Misses       5338    5318    -20
Impacted Files Coverage Δ
src/core/cuda_interface.cpp 98% <ø> (ø) ⬆️
src/core/layered.cpp 79% <0%> (ø) ⬆️
src/core/domain_decomposition.cpp 91% <0%> (+3%) ⬆️
src/core/lattice.cpp 89% <0%> (+6%) ⬆️

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 22d2ad9...45f3d08. Read the comment docs.

@fweik
Copy link
Contributor

fweik commented Oct 30, 2018

This code is only relevant to the GPU, so this should be if defined(LB_ELECTROHYDRODYNAMICS) && defined(LB_GPU) no?

@itischler
Copy link
Contributor Author

Yes, but as long as the CUDA flag is enabled the cuda_interface will be compiled and thus this will lead to this compile error

@RudolfWeeber
Copy link
Contributor

Can be merged

@fweik fweik merged commit 478818f into espressomd:python Oct 31, 2018
RudolfWeeber pushed a commit to RudolfWeeber/espresso that referenced this pull request Nov 1, 2018
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.

4 participants