Skip to content

Conversation

@mohanchen
Copy link
Collaborator

@mohanchen mohanchen commented Jan 27, 2026

Reorganize the pw module source files, delete operator_pw directory

abacus_fixer and others added 16 commits January 23, 2026 20:25
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
This commit includes:
1. Renamed files in module_pwdft directory:
   - VL_in_pw.cpp/h → vl_pw.cpp/h
   - VNL_in_pw.cpp/h → vnl_pw.cpp/h
   - VNL_grad_pw.cpp → vnl_pw_grad.cpp
   - VSep_in_pw.cpp/h → vsep_pw.cpp/h

2. Updated CMakeLists.txt and Makefile.Objects to use new filenames

3. Updated include paths in 41 files across the codebase:
   - source_cell/test/klist_test.cpp and klist_test_para.cpp
   - source_esolver/esolver_fp.h, esolver_ks_pw.cpp, esolver_ks_pw.h
   - source_estate/module_pot/pot_sep.h, potential_new.h, setup_estate_pw.h
   - source_estate/test/elecstate_pw_test.cpp
   - source_io/test/for_testing_input_conv.h, for_testing_klist.h
   - source_lcao/LCAO_set.h
   - source_psi/psi_initializer.h and related files
   - source_pw/module_ofdft/of_stress_pw.h
   - source_pw/module_pwdft/* (multiple files)
   - source_pw/module_stodft/sto_stress_pw.h

4. Verified compilation success with make -j30

The renaming follows consistent naming conventions and makes filenames more concise.
@mohanchen mohanchen added Refactor Refactor ABACUS codes The Absolute Zero Reduce the "entropy" of the code to 0 labels Jan 27, 2026
@mohanchen mohanchen changed the title 20260127 move Reorganize the pw module source files Jan 27, 2026
This commit fixes the CI/CD build error by updating references to the old operator_pw directory structure:

1. Updated source/source_hsolver/test/CMakeLists.txt:
   - Changed all 7 references from '../../source_pw/module_pwdft/operator_pw/operator_pw.cpp' to '../../source_pw/module_pwdft/op_pw.cpp'

2. Updated source/source_hsolver/test/diago_mock.h:
   - Changed '#include "source_pw/module_pwdft/operator_pw/operator_pw.h"' to '#include "source_pw/module_pwdft/op_pw.h"'

The operator_pw directory has been renamed and its files moved to the module_pwdft root directory with op_pw_ prefixes, so these path updates are necessary to ensure CI/CD builds succeed.
@mohanchen mohanchen merged commit beae8b2 into deepmodeling:develop Jan 27, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Refactor Refactor ABACUS codes The Absolute Zero Reduce the "entropy" of the code to 0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants