forked from abacusmodeling/abacus-develop
-
Notifications
You must be signed in to change notification settings - Fork 151
Fix dependency cycles #6902
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
Open
mohanchen
wants to merge
13
commits into
deepmodeling:develop
Choose a base branch
from
mohanchen:fix_dependency_cycles
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix dependency cycles #6902
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Remove #ifdef __MPI from timer code, encapsulate in timer_wrapper.h 2. Move ESolver clean logic to after_all_runners method 3. Replace clean_esolver calls with direct delete p_esolver 4. Remove #ifdef __MPI from delete p_esolver 5. Add Cblacs_exit(1) in after_all_runners for LCAO calculations
…cture - Added detailed English comments to cal_HR_exx function - Moved implementation to cpp file and added explicit instantiations - Improved header file organization with sections - Removed unnecessary LCAO_hamilt.hpp include - Enhanced endif comments for better code readability
The LCAO_hamilt.hpp file was empty after moving its implementation to spar_exx.cpp. This commit removes the unused header file and updates all references to it.
- Removed #include xc_functional.h from exx_info.h - Removed #include exx_info.h from xc_functional.h This breaks the circular dependency between these two header files, allowing them to compile independently.
- Removed unnecessary #include source_lcao/hamilt_lcao.h from spar_dh.h, spar_hsr.h, and spar_u.h - Added direct dependencies to spar_dh.h: matrix.h, parallel_orbitals.h, two_center_bundle.h, ORB_read.h - Adjusted include order in spar_hsr.h and spar_u.h - Added necessary include to spar_hsr.cpp for HamiltLCAO access
- Added xc_functional.h include to esolver_ks_pw.cpp for XC_Functional class access - Added xc_functional.h include to input_conv.cpp for XC_Functional class access - Added parallel_comm.h include to op_exx_pw.cpp for KP_WORLD communication - Added global_variable.h and exx_info.h includes to stress_pw.cpp for GlobalC namespace access These changes fix compilation errors caused by the dependency refactoring.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix dependency cycles