Skip to content

Commit b222891

Browse files
amontoisonamontoison
committed
Display storage allocated in the stats
1 parent 40039bf commit b222891

39 files changed

+163
-54
lines changed

‎src/bicgstab.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ kwargs_bicgstab = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose,
170170
if rNorm == 0
171171
stats.niter = 0
172172
stats.solved, stats.inconsistent = true, false
173+
stats.storage = sizeof(solver)
173174
stats.timer = ktimer(start_time)
174175
stats.status = "x = 0 is a zero-residual solution"
175176
solver.warm_start = false
@@ -187,6 +188,7 @@ kwargs_bicgstab = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose,
187188
if next_ρ == 0
188189
stats.niter = 0
189190
stats.solved, stats.inconsistent = false, false
191+
stats.storage = sizeof(solver)
190192
stats.timer = ktimer(start_time)
191193
stats.status = "Breakdown bᴴc = 0"
192194
solver.warm_start = false
@@ -260,6 +262,7 @@ kwargs_bicgstab = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose,
260262
stats.niter = iter
261263
stats.solved = solved
262264
stats.inconsistent = false
265+
stats.storage = sizeof(solver)
263266
stats.timer = ktimer(start_time)
264267
stats.status = status
265268
return solver

‎src/bilq.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ kwargs_bilq = (:c, :transfer_to_bicg, :M, :N, :ldiv, :atol, :rtol, :itmax, :time
164164
stats.niter = 0
165165
stats.solved = true
166166
stats.inconsistent = false
167+
stats.storage = sizeof(solver)
167168
stats.timer = ktimer(start_time)
168169
stats.status = "x = 0 is a zero-residual solution"
169170
solver.warm_start = false
@@ -179,6 +180,7 @@ kwargs_bilq = (:c, :transfer_to_bicg, :M, :N, :ldiv, :atol, :rtol, :itmax, :time
179180
stats.niter = 0
180181
stats.solved = false
181182
stats.inconsistent = false
183+
stats.storage = sizeof(solver)
182184
stats.timer = ktimer(start_time)
183185
stats.status = "Breakdown bᴴc = 0"
184186
solver.warm_start = false
@@ -393,6 +395,7 @@ kwargs_bilq = (:c, :transfer_to_bicg, :M, :N, :ldiv, :atol, :rtol, :itmax, :time
393395
stats.niter = iter
394396
stats.solved = solved_lq || solved_cg
395397
stats.inconsistent = false
398+
stats.storage = sizeof(solver)
396399
stats.timer = ktimer(start_time)
397400
stats.status = status
398401
return solver

‎src/bilqr.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ kwargs_bilqr = (:transfer_to_bicg, :atol, :rtol, :itmax, :timemax, :verbose, :hi
166166
stats.niter = 0
167167
stats.solved_primal = false
168168
stats.solved_dual = false
169+
stats.storage = sizeof(solver)
169170
stats.timer = ktimer(start_time)
170171
stats.status = "Breakdown bᴴc = 0"
171172
solver.warm_start = false
@@ -468,6 +469,7 @@ kwargs_bilqr = (:transfer_to_bicg, :atol, :rtol, :itmax, :timemax, :verbose, :hi
468469
stats.niter = iter
469470
stats.solved_primal = solved_primal
470471
stats.solved_dual = solved_dual
472+
stats.storage = sizeof(solver)
471473
stats.timer = ktimer(start_time)
472474
stats.status = status
473475
return solver

‎src/block_gmres.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ kwargs_block_gmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rto
330330
# Update stats
331331
stats.niter = iter
332332
stats.solved = solved
333+
stats.storage = sizeof(solver)
333334
stats.timer = ktimer(start_time)
334335
stats.status = status
335336
return solver

‎src/car.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ kwargs_car = (:M, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :history, :ca
163163
if rNorm == 0
164164
stats.niter = 0
165165
stats.solved, stats.inconsistent = true, false
166+
stats.storage = sizeof(solver)
166167
stats.timer = ktimer(start_time)
167168
stats.status = "x = 0 is a zero-residual solution"
168169
solver.warm_start = false
@@ -238,6 +239,7 @@ kwargs_car = (:M, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :history, :ca
238239
stats.niter = iter
239240
stats.solved = solved
240241
stats.inconsistent = inconsistent
242+
stats.storage = sizeof(solver)
241243
stats.timer = ktimer(start_time)
242244
stats.status = status
243245
return solver

‎src/cg.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ kwargs_cg = (:M, :ldiv, :radius, :linesearch, :atol, :rtol, :itmax, :timemax, :v
148148
if γ == 0
149149
stats.niter = 0
150150
stats.solved, stats.inconsistent = true, false
151+
stats.storage = sizeof(solver)
151152
stats.timer = ktimer(start_time)
152153
stats.status = "x = 0 is a zero-residual solution"
153154
solver.warm_start = false
@@ -257,6 +258,7 @@ kwargs_cg = (:M, :ldiv, :radius, :linesearch, :atol, :rtol, :itmax, :timemax, :v
257258
stats.niter = iter
258259
stats.solved = solved
259260
stats.inconsistent = inconsistent
261+
stats.storage = sizeof(solver)
260262
stats.timer = ktimer(start_time)
261263
stats.status = status
262264
return solver

‎src/cg_lanczos.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ kwargs_cg_lanczos = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :timemax
147147
stats.solved = true
148148
stats.Anorm = zero(T)
149149
stats.indefinite = false
150+
stats.storage = sizeof(solver)
150151
stats.timer = ktimer(start_time)
151152
stats.status = "x = 0 is a zero-residual solution"
152153
solver.warm_start = false
@@ -247,6 +248,7 @@ kwargs_cg_lanczos = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :timemax
247248
stats.solved = solved
248249
stats.Anorm = sqrt(Anorm2)
249250
stats.indefinite = indefinite
251+
stats.storage = sizeof(solver)
250252
stats.timer = ktimer(start_time)
251253
stats.status = status
252254
return solver

‎src/cg_lanczos_shift.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ kwargs_cg_lanczos_shift = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :t
148148
if β == 0
149149
stats.niter = 0
150150
stats.solved = true
151+
stats.storage = sizeof(solver)
151152
stats.timer = ktimer(start_time)
152153
stats.status = "x = 0 is a zero-residual solution"
153154
return solver
@@ -267,6 +268,7 @@ kwargs_cg_lanczos_shift = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :t
267268
# Update stats. TODO: Estimate Anorm and Acond.
268269
stats.niter = iter
269270
stats.solved = solved
271+
stats.storage = sizeof(solver)
270272
stats.timer = ktimer(start_time)
271273
stats.status = status
272274
return solver

‎src/cgls.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ kwargs_cgls = (:M, :ldiv, :radius, :λ, :atol, :rtol, :itmax, :timemax, :verbose
152152
if bNorm == 0
153153
stats.niter = 0
154154
stats.solved, stats.inconsistent = true, false
155+
stats.storage = sizeof(solver)
155156
stats.timer = ktimer(start_time)
156157
stats.status = "x = 0 is a zero-residual solution"
157158
history && push!(rNorms, zero(T))
@@ -228,6 +229,7 @@ kwargs_cgls = (:M, :ldiv, :radius, :λ, :atol, :rtol, :itmax, :timemax, :verbose
228229
stats.niter = iter
229230
stats.solved = solved
230231
stats.inconsistent = false
232+
stats.storage = sizeof(solver)
231233
stats.timer = ktimer(start_time)
232234
stats.status = status
233235
return solver

‎src/cgne.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ kwargs_cgne = (:N, :ldiv, :λ, :atol, :rtol, :itmax, :timemax, :verbose, :histor
159159
if rNorm == 0
160160
stats.niter = 0
161161
stats.solved, stats.inconsistent = true, false
162+
stats.storage = sizeof(solver)
162163
stats.timer = ktimer(start_time)
163164
stats.status = "x = 0 is a zero-residual solution"
164165
return solver
@@ -237,6 +238,7 @@ kwargs_cgne = (:N, :ldiv, :λ, :atol, :rtol, :itmax, :timemax, :verbose, :histor
237238
stats.niter = iter
238239
stats.solved = solved
239240
stats.inconsistent = inconsistent
241+
stats.storage = sizeof(solver)
240242
stats.timer = ktimer(start_time)
241243
stats.status = status
242244
return solver

‎src/cgs.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ kwargs_cgs = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :hist
165165
if rNorm == 0
166166
stats.niter = 0
167167
stats.solved, stats.inconsistent = true, false
168+
stats.storage = sizeof(solver)
168169
stats.timer = ktimer(start_time)
169170
stats.status = "x = 0 is a zero-residual solution"
170171
solver.warm_start = false
@@ -176,6 +177,7 @@ kwargs_cgs = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :hist
176177
if ρ == 0
177178
stats.niter = 0
178179
stats.solved, stats.inconsistent = false, false
180+
stats.storage = sizeof(solver)
179181
stats.timer = ktimer(start_time)
180182
stats.status = "Breakdown bᴴc = 0"
181183
solver.warm_start =false
@@ -264,6 +266,7 @@ kwargs_cgs = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :hist
264266
stats.niter = iter
265267
stats.solved = solved
266268
stats.inconsistent = false
269+
stats.storage = sizeof(solver)
267270
stats.timer = ktimer(start_time)
268271
stats.status = status
269272
return solver

‎src/cr.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ kwargs_cr = (:M, :ldiv, :radius, :linesearch, :γ, :atol, :rtol, :itmax, :timema
159159
if ρ == 0
160160
stats.niter = 0
161161
stats.solved, stats.inconsistent = true, false
162+
stats.storage = sizeof(solver)
162163
stats.timer = ktimer(start_time)
163164
stats.status = "x = 0 is a zero-residual solution"
164165
history && push!(ArNorms, zero(T))
@@ -202,6 +203,7 @@ kwargs_cr = (:M, :ldiv, :radius, :linesearch, :γ, :atol, :rtol, :itmax, :timema
202203
(verbose > 0) && @printf(iostream, "nonpositive curvature detected: pᴴAp = %8.1e and rᴴAr = %8.1e\n", pAp, ρ)
203204
stats.solved = solved
204205
stats.inconsistent = false
206+
stats.storage = sizeof(solver)
205207
stats.timer = ktimer(start_time)
206208
stats.status = "nonpositive curvature"
207209
return solver
@@ -367,6 +369,7 @@ kwargs_cr = (:M, :ldiv, :radius, :linesearch, :γ, :atol, :rtol, :itmax, :timema
367369
stats.niter = iter
368370
stats.solved = solved
369371
stats.inconsistent = false
372+
stats.storage = sizeof(solver)
370373
stats.timer = ktimer(start_time)
371374
stats.status = "solver encountered numerical issues"
372375
solver.warm_start = false
@@ -397,6 +400,7 @@ kwargs_cr = (:M, :ldiv, :radius, :linesearch, :γ, :atol, :rtol, :itmax, :timema
397400
stats.niter = iter
398401
stats.solved = solved
399402
stats.inconsistent = false
403+
stats.storage = sizeof(solver)
400404
stats.timer = ktimer(start_time)
401405
stats.status = status
402406
return solver

‎src/craig.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ kwargs_craig = (:M, :N, :ldiv, :transfer_to_lsqr, :sqd, :λ, :btol, :conlim, :at
210210
if β₁ == 0
211211
stats.niter = 0
212212
stats.solved, stats.inconsistent = true, false
213+
stats.storage = sizeof(solver)
213214
stats.timer = ktimer(start_time)
214215
stats.status = "x = 0 is a zero-residual solution"
215216
return solver
@@ -390,6 +391,7 @@ kwargs_craig = (:M, :N, :ldiv, :transfer_to_lsqr, :sqd, :λ, :btol, :conlim, :at
390391
stats.niter = iter
391392
stats.solved = solved
392393
stats.inconsistent = inconsistent
394+
stats.storage = sizeof(solver)
393395
stats.timer = ktimer(start_time)
394396
stats.status = status
395397
return solver

‎src/craigmr.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ kwargs_craigmr = (:M, :N, :ldiv, :sqd, :λ, :atol, :rtol, :itmax, :timemax, :ver
197197
stats.solved, stats.inconsistent = true, false
198198
history && push!(rNorms, β)
199199
history && push!(ArNorms, zero(T))
200+
stats.storage = sizeof(solver)
200201
stats.timer = ktimer(start_time)
201202
stats.status = "x = 0 is a zero-residual solution"
202203
return solver
@@ -225,6 +226,7 @@ kwargs_craigmr = (:M, :N, :ldiv, :sqd, :λ, :atol, :rtol, :itmax, :timemax, :ver
225226
stats.solved, stats.inconsistent = true, false
226227
history && push!(rNorms, β)
227228
history && push!(ArNorms, zero(T))
229+
stats.storage = sizeof(solver)
228230
stats.timer = ktimer(start_time)
229231
stats.status = "x = 0 is a minimum least-squares solution"
230232
return solver
@@ -382,6 +384,7 @@ kwargs_craigmr = (:M, :N, :ldiv, :sqd, :λ, :atol, :rtol, :itmax, :timemax, :ver
382384
stats.niter = iter
383385
stats.solved = solved
384386
stats.inconsistent = inconsistent
387+
stats.storage = sizeof(solver)
385388
stats.timer = ktimer(start_time)
386389
stats.status = status
387390
return solver

‎src/crls.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ kwargs_crls = (:M, :ldiv, :radius, :λ, :atol, :rtol, :itmax, :timemax, :verbose
147147
if bNorm == 0
148148
stats.niter = 0
149149
stats.solved, stats.inconsistent = true, false
150+
stats.storage = sizeof(solver)
150151
stats.timer = ktimer(start_time)
151152
stats.status = "x = 0 is a zero-residual solution"
152153
history && push!(ArNorms, zero(T))
@@ -253,6 +254,7 @@ kwargs_crls = (:M, :ldiv, :radius, :λ, :atol, :rtol, :itmax, :timemax, :verbose
253254
stats.niter = iter
254255
stats.solved = solved
255256
stats.inconsistent = false
257+
stats.storage = sizeof(solver)
256258
stats.timer = ktimer(start_time)
257259
stats.status = status
258260
return solver

‎src/crmr.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ kwargs_crmr = (:N, :ldiv, :λ, :atol, :rtol, :itmax, :timemax, :verbose, :histor
158158
if bNorm == 0
159159
stats.niter = 0
160160
stats.solved, stats.inconsistent = true, false
161+
stats.storage = sizeof(solver)
161162
stats.timer = ktimer(start_time)
162163
stats.status = "x = 0 is a zero-residual solution"
163164
history && push!(ArNorms, zero(T))
@@ -229,6 +230,7 @@ kwargs_crmr = (:N, :ldiv, :λ, :atol, :rtol, :itmax, :timemax, :verbose, :histor
229230
stats.niter = iter
230231
stats.solved = solved
231232
stats.inconsistent = inconsistent
233+
stats.storage = sizeof(solver)
232234
stats.timer = ktimer(start_time)
233235
stats.status = status
234236
return solver

‎src/diom.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ kwargs_diom = (:M, :N, :ldiv, :reorthogonalization, :atol, :rtol, :itmax, :timem
154154
if rNorm == 0
155155
stats.niter = 0
156156
stats.solved, stats.inconsistent = true, false
157+
stats.storage = sizeof(solver)
157158
stats.timer = ktimer(start_time)
158159
stats.status = "x = 0 is a zero-residual solution"
159160
solver.warm_start = false
@@ -311,6 +312,7 @@ kwargs_diom = (:M, :N, :ldiv, :reorthogonalization, :atol, :rtol, :itmax, :timem
311312
stats.niter = iter
312313
stats.solved = solved
313314
stats.inconsistent = false
315+
stats.storage = sizeof(solver)
314316
stats.timer = ktimer(start_time)
315317
stats.status = status
316318
return solver

‎src/dqgmres.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ kwargs_dqgmres = (:M, :N, :ldiv, :reorthogonalization, :atol, :rtol, :itmax, :ti
154154
if rNorm == 0
155155
stats.niter = 0
156156
stats.solved, stats.inconsistent = true, false
157+
stats.storage = sizeof(solver)
157158
stats.timer = ktimer(start_time)
158159
stats.status = "x = 0 is a zero-residual solution"
159160
solver.warm_start = false
@@ -313,6 +314,7 @@ kwargs_dqgmres = (:M, :N, :ldiv, :reorthogonalization, :atol, :rtol, :itmax, :ti
313314
stats.niter = iter
314315
stats.solved = solved
315316
stats.inconsistent = false
317+
stats.storage = sizeof(solver)
316318
stats.timer = ktimer(start_time)
317319
stats.status = status
318320
return solver

‎src/fgmres.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ kwargs_fgmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :i
164164
if β == 0
165165
stats.niter = 0
166166
stats.solved, stats.inconsistent = true, false
167+
stats.storage = sizeof(solver)
167168
stats.timer = ktimer(start_time)
168169
stats.status = "x = 0 is a zero-residual solution"
169170
solver.warm_start = false
@@ -363,6 +364,7 @@ kwargs_fgmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :i
363364
stats.niter = iter
364365
stats.solved = solved
365366
stats.inconsistent = inconsistent
367+
stats.storage = sizeof(solver)
366368
stats.timer = ktimer(start_time)
367369
stats.status = status
368370
return solver

‎src/fom.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ kwargs_fom = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :itma
159159
if β == 0
160160
stats.niter = 0
161161
stats.solved, stats.inconsistent = true, false
162+
stats.storage = sizeof(solver)
162163
stats.timer = ktimer(start_time)
163164
stats.status = "x = 0 is a zero-residual solution"
164165
solver.warm_start = false
@@ -343,6 +344,7 @@ kwargs_fom = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :itma
343344
stats.niter = iter
344345
stats.solved = solved
345346
stats.inconsistent = !solved && breakdown
347+
stats.storage = sizeof(solver)
346348
stats.timer = ktimer(start_time)
347349
stats.status = status
348350
return solver

‎src/gmres.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ kwargs_gmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :it
159159
if β == 0
160160
stats.niter = 0
161161
stats.solved, stats.inconsistent = true, false
162+
stats.storage = sizeof(solver)
162163
stats.timer = ktimer(start_time)
163164
stats.status = "x = 0 is a zero-residual solution"
164165
solver.warm_start = false
@@ -360,6 +361,7 @@ kwargs_gmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rtol, :it
360361
stats.niter = iter
361362
stats.solved = solved
362363
stats.inconsistent = inconsistent
364+
stats.storage = sizeof(solver)
363365
stats.timer = ktimer(start_time)
364366
stats.status = status
365367
return solver

‎src/gpmr.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ kwargs_gpmr = (:C, :D, :E, :F, :ldiv, :gsp, :λ, :μ, :reorthogonalization, :ato
522522
stats.niter = iter
523523
stats.solved = solved
524524
stats.inconsistent = inconsistent
525+
stats.storage = sizeof(solver)
525526
stats.timer = ktimer(start_time)
526527
stats.status = status
527528
return solver

0 commit comments

Comments
 (0)