Skip to content

Commit 1d87c67

Browse files
author
abacus_fixer
committed
refactor(dftu): prune redundant #include in module_dftu
Remove unused #include directives across 12 files in source/source_lcao/module_dftu/. Each removal was verified by symbol-usage grep against the file body (excluding the include lines themselves) and by compiling the dftu + hamilt_lcao CMake targets. Removed includes per file: - dftu_lcao.cpp: parameter.h, constants.h, global_function.h, inverse_matrix.h, memory_recorder.h, magnetism.h, charge.h and unused <cstdint>/<cmath>/<cstdio>/<cstring>/<fstream>/<iomanip>/ <iostream>/<sstream>; add focused matrix.h (for ModuleBase::matrix::operator() via occ_mat), tool_quit.h, tool_title.h - dftu_folding.cpp: parameter.h, hcontainer.h, hcontainer_funcs.h - dftu_force.cpp: parameter.h, constants.h, inverse_matrix.h, elecstate_lcao.h, magnetism.h, charge.h, <cmath>, <fstream>, <iomanip>, <iostream>, <sstream>, <stdio.h>, <string.h> - dftu_hamilt.cpp: parameter.h - dftu_lcao_op.cpp: hcontainer_funcs.h, <unordered_set> - dftu_lcao_op_legacy.cpp: dftu_lcao.h (already provided by its own .h) - dftu_occup.cpp: parameter.h - dftu_tools.cpp: timer.h (no direct ModuleBase::timer use), parameter.h - dftu_yukawa.cpp: parameter.h, <complex>, <fstream>, <iomanip>, <iostream>, <sstream>, <cstdio>, <cstring> - dftu_lcao.h: charge_mixing.h (still provided transitively via dftu_base.h), force_stress_arrays.h (not directly used here) - dftu_lcao_op.h: density_matrix.h (not directly used here) - dftu_lcao_op_legacy.h: timer.h (not directly used here) Note: scalapack_connector.h was kept in dftu_force.cpp / dftu_hamilt.cpp / dftu_occup.cpp -- these files call ScalapackConnector::gemm. Verification: OMP_NUM_THREADS=1 make -C build_std_para dftu hamilt_lcao => EXIT=0, no errors, no warnings. Full abacus build deferred to user; external modules that include dftu_lcao.h and use Charge_Mixing (chgmixing.cpp, esolver_ks.cpp/h) should still resolve via dftu_lcao.h -> dftu_base.h -> charge_mixing.h.
1 parent 144c795 commit 1d87c67

12 files changed

Lines changed: 4 additions & 54 deletions

source/source_lcao/module_dftu/dftu_folding.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
#include "dftu_folding.h"
33
#include "dftu_lcao.h"
44
#include "source_base/timer.h"
5-
#include "source_io/module_parameter/parameter.h"
65
#include "source_cell/module_neighbor/sltk_grid_driver.h"
76
#include "source_lcao/hamilt_lcao.h"
8-
#include "source_hamilt/module_hcontainer/hcontainer.h"
9-
#include "source_hamilt/module_hcontainer/hcontainer_funcs.h"
107

118
namespace DFTU_LCAO {
129

source/source_lcao/module_dftu/dftu_force.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
1-
#include "source_io/module_parameter/parameter.h"
2-
31
#ifdef __LCAO
42
#include "dftu_force.h"
53
#include "dftu_folding.h"
64
#include "dftu_lcao.h"
7-
#include "source_base/constants.h"
85
#include "source_base/global_function.h"
9-
#include "source_base/inverse_matrix.h"
106
#include "source_base/module_external/scalapack_connector.h"
117
#include "source_base/parallel_reduce.h"
128
#include "source_base/timer.h"
13-
#include "source_estate/elecstate_lcao.h"
14-
#include "source_cell/magnetism.h"
15-
#include "source_estate/module_charge/charge.h"
169

17-
#include <cmath>
1810
#include <complex>
19-
#include <fstream>
20-
#include <iomanip>
21-
#include <iostream>
22-
#include <sstream>
23-
#include <stdio.h>
24-
#include <string.h>
2511
#include <string>
2612

2713

source/source_lcao/module_dftu/dftu_hamilt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "dftu_lcao.h"
22
#include "source_base/module_external/scalapack_connector.h"
3-
#include "source_io/module_parameter/parameter.h"
43
#include "source_base/timer.h"
54

65

source/source_lcao/module_dftu/dftu_lcao.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
#include "dftu_lcao.h"
22

3-
#include "source_io/module_parameter/parameter.h"
4-
#include "source_base/constants.h"
5-
#include "source_base/global_function.h"
6-
#include "source_base/inverse_matrix.h"
7-
#include "source_base/memory_recorder.h"
3+
#include "source_base/matrix.h" // occ_mat uses ModuleBase::matrix::operator()
4+
#include "source_base/tool_quit.h"
5+
#include "source_base/tool_title.h"
86
#include "source_base/timer.h"
9-
#include "source_cell/magnetism.h"
10-
#include "source_estate/module_charge/charge.h"
117

12-
#include <cstdint>
13-
#include <cmath>
148
#include <complex>
15-
#include <cstdio>
16-
#include <cstring>
17-
#include <fstream>
18-
#include <iomanip>
19-
#include <iostream>
20-
#include <sstream>
219
#include <vector>
2210

2311
// mohan add 2025-11-06

source/source_lcao/module_dftu/dftu_lcao.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
#include "source_cell/klist.h"
55
#include "source_cell/unitcell.h"
66
#include "source_basis/module_ao/parallel_orbitals.h"
7-
#include "source_estate/module_charge/charge_mixing.h"
87
#include "source_pw/module_pwdft/dftu_base.h"
98
#ifdef __LCAO
109
#include "source_basis/module_ao/orb_read.h"
1110
#include "source_hamilt/hamilt.h"
1211
#include "source_hamilt/module_hcontainer/hcontainer.h"
1312
#include "source_estate/module_dm/density_matrix.h"
14-
#include "source_lcao/force_stress_arrays.h" // mohan add 2024-06-15
1513
#endif
1614

1715
#include <string>

source/source_lcao/module_dftu/dftu_lcao_op.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
#include "source_base/tool_title.h"
55
#include "source_cell/module_neighbor/sltk_grid_driver.h"
66
#include "source_lcao/module_operator_lcao/operator_lcao.h"
7-
#include "source_hamilt/module_hcontainer/hcontainer_funcs.h"
87
#include "source_io/module_parameter/parameter.h"
9-
#ifdef _OPENMP
10-
#include <unordered_set>
11-
#endif
128
#include "source_base/parallel_reduce.h"
139

1410
template <typename TK, typename TR>

source/source_lcao/module_dftu/dftu_lcao_op.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "source_basis/module_nao/two_center_integrator.h"
55
#include "source_cell/module_neighbor/sltk_grid_driver.h"
66
#include "source_cell/unitcell.h"
7-
#include "source_estate/module_dm/density_matrix.h"
87
#include "source_lcao/module_operator_lcao/operator_lcao.h"
98
#include "source_lcao/module_dftu/dftu_lcao.h"
109
#include "source_hamilt/module_hcontainer/hcontainer.h"

source/source_lcao/module_dftu/dftu_lcao_op_legacy.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "dftu_lcao_op_legacy.h"
22
#include "source_base/timer.h"
33
#include "source_base/tool_title.h"
4-
#include "source_lcao/module_dftu/dftu_lcao.h"
54

65
namespace hamilt
76
{

source/source_lcao/module_dftu/dftu_lcao_op_legacy.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef OPDFTULCAO_H
22
#define OPDFTULCAO_H
33

4-
#include "source_base/timer.h"
54
#include "source_lcao/module_operator_lcao/operator_lcao.h"
65
#include "source_lcao/module_dftu/dftu_lcao.h" // mohan add 20251107
76

source/source_lcao/module_dftu/dftu_occup.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#include "dftu_lcao.h"
22
#include "dftu_folding.h"
33
#include "source_base/timer.h"
4-
#include "source_io/module_parameter/parameter.h"
4+
#include "source_base/module_external/scalapack_connector.h"
55
#ifdef __LCAO
66
#include "source_lcao/hamilt_lcao.h"
77
#endif
8-
#include "source_base/module_external/scalapack_connector.h"
98

109
// copy_occ_mat(), zero_occ_mat(), mix_occ_mat(), set_occ_mat(ucell),
1110
// get_occ_mat_flat(), set_occ_mat_flat()

0 commit comments

Comments
 (0)