Commit 68f5c60
Refactor: inject solver config into HSolver/PEXSI instead of reading PARAM
Group C of the source_hsolver PARAM removal: the parameters that were read
from the PARAM global mid-algorithm are now injected through constructors,
following the existing explicit-scalar style of the HSolverPW / HSolverLCAO
constructors.
HSolverPW gains nbands, diago_smooth_ethr, pw_diag_ndim, diag_subspace and
nb2d. Note that PARAM.inp.nbands (the global band count used by bpcg's
init_iter) is deliberately kept distinct from psi.get_nbands(), which is the
local count under band parallelism.
HSolverPW_SDFT gains ks_run, all_ks_run and bndpar, and forwards the five new
base-class values.
HSolverLIP gains use_uspp.
HSolverLCAO gains kpar_lcao, plus nlocal and nelec for the pexsi branch.
PEXSI chain: the two reads in module_pexsi/pexsi_solver.cpp could not simply
be lifted to its caller, because DiagoPexsi did not have nelec either, so the
whole chain is threaded in one go:
- PEXSI_Solver::prepare() takes nlocal and nelec and stores them, alongside
the nb / nrow / ncol it already received.
- DiagoPexsi's constructor takes nspin, nlocal and nelec. The nspin == 4 ->
single-density-matrix collapse was computed identically in the constructor
and the destructor; it is now stored once as nspin_dm, which also removes
the destructor's dependency on PARAM still holding the same nspin.
- HSolverLCAO passes its solve()-argument nspin plus the injected nlocal and
nelec down to DiagoPexsi.
Two incidental fixes in code that had to be touched anyway:
- DiagoPexsi::diag() declared a std::vector<double> eigen(nlocal) that was
never used; removed. This was the only nlocal read in that function.
- The constructor read pexsi_mu through this->ps before ps was assigned. It
is a static member so this happened to work, but it is UB on a null
unique_ptr; it now reads pexsi::PEXSI_Solver::pexsi_mu directly.
Also fixes a pre-existing bug in test_hsolver_pw.cpp: the HSolverPW fixture
passed an extra `false` after method_in, so every argument from nspin_in
onwards was shifted by one (nspin_in received use_uspp, diag_thr_in received
PW_DIAG_NMAX, need_subspace_in received PW_DIAG_THR, and so on). Adding the
new parameters made the call fail to compile, which surfaced it. The affected
tests only construct the object or exercise the early npw_total < nbands
guard, so no assertion depended on the shifted values.
PARAM occurrences in source_hsolver production code: 83 -> 60. Remaining are
the six dense LCAO diagonalizers sharing nlocal/nbands (group D) and
DiagoIterAssist's basis_type/calculation switches (group E).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>1 parent 3e64d44 commit 68f5c60
22 files changed
Lines changed: 169 additions & 62 deletions
File tree
- source
- source_esolver
- source_hsolver
- module_pexsi
- test
- source_lcao
- module_deltaspin
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
437 | | - | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
438 | 442 | | |
439 | 443 | | |
440 | 444 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
329 | 329 | | |
330 | 330 | | |
331 | 331 | | |
332 | | - | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
333 | 337 | | |
334 | 338 | | |
335 | 339 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
136 | | - | |
| 136 | + | |
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
225 | 230 | | |
226 | 231 | | |
227 | 232 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | | - | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
167 | 175 | | |
168 | 176 | | |
169 | 177 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
22 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
23 | 25 | | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
31 | 32 | | |
32 | | - | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
38 | | - | |
39 | | - | |
40 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| |||
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
| 52 | + | |
57 | 53 | | |
58 | 54 | | |
59 | 55 | | |
| |||
67 | 63 | | |
68 | 64 | | |
69 | 65 | | |
70 | | - | |
71 | 66 | | |
72 | 67 | | |
73 | 68 | | |
74 | 69 | | |
75 | 70 | | |
| 71 | + | |
| 72 | + | |
76 | 73 | | |
77 | 74 | | |
78 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
32 | 40 | | |
33 | 41 | | |
34 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
59 | 58 | | |
60 | 59 | | |
61 | 60 | | |
62 | | - | |
| 61 | + | |
63 | 62 | | |
64 | 63 | | |
65 | | - | |
| 64 | + | |
66 | 65 | | |
67 | 66 | | |
68 | | - | |
| 67 | + | |
69 | 68 | | |
70 | 69 | | |
71 | 70 | | |
| |||
113 | 112 | | |
114 | 113 | | |
115 | 114 | | |
116 | | - | |
| 115 | + | |
117 | 116 | | |
118 | 117 | | |
119 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
19 | 24 | | |
20 | 25 | | |
21 | 26 | | |
| |||
40 | 45 | | |
41 | 46 | | |
42 | 47 | | |
43 | | - | |
| 48 | + | |
44 | 49 | | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
45 | 54 | | |
46 | 55 | | |
47 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
| |||
106 | 105 | | |
107 | 106 | | |
108 | 107 | | |
109 | | - | |
| 108 | + | |
110 | 109 | | |
111 | 110 | | |
112 | 111 | | |
| |||
0 commit comments