@@ -335,6 +335,7 @@ def test_petric(
335
335
metric_period : int ,
336
336
complete_gradient_epochs : None | list [int ] = None ,
337
337
precond_update_epochs : None | list [int ] = None ,
338
+ precond_hessian_factor : float = 16.0 ,
338
339
):
339
340
340
341
# get arguments and values such that we can dump them in the outdir
@@ -346,39 +347,25 @@ def test_petric(
346
347
current_datetime = datetime .now ()
347
348
formatted_datetime = current_datetime .strftime ("%Y%m%d-%H%M%S" )
348
349
350
+ sdir_name = f"{ formatted_datetime } _ss_{ step_size } _n_{ num_iter } _subs_{ num_subsets } _phf_{ precond_hessian_factor } "
351
+
349
352
if ds == 0 :
350
353
srcdir = SRCDIR / "Siemens_mMR_NEMA_IQ"
351
- outdir = (
352
- OUTDIR
353
- / "mMR_NEMA"
354
- / f"{ formatted_datetime } _ss_{ step_size } _n_{ num_iter } _subs_{ num_subsets } "
355
- )
354
+ outdir = OUTDIR / "mMR_NEMA" / sdir_name
356
355
metrics = [
357
356
MetricsWithTimeout (outdir = outdir , transverse_slice = 72 , coronal_slice = 109 )
358
357
]
359
358
elif ds == 1 :
360
359
srcdir = SRCDIR / "NeuroLF_Hoffman_Dataset"
361
- outdir = (
362
- OUTDIR
363
- / "NeuroLF_Hoffman"
364
- / f"{ formatted_datetime } _ss_{ step_size } _n_{ num_iter } _subs_{ num_subsets } "
365
- )
360
+ outdir = OUTDIR / "NeuroLF_Hoffman" / sdir_name
366
361
metrics = [MetricsWithTimeout (outdir = outdir , transverse_slice = 72 )]
367
362
elif ds == 2 :
368
363
srcdir = SRCDIR / "Siemens_Vision600_thorax"
369
- outdir = (
370
- OUTDIR
371
- / "Vision600_thorax"
372
- / f"{ formatted_datetime } _ss_{ step_size } _n_{ num_iter } _subs_{ num_subsets } "
373
- )
364
+ outdir = OUTDIR / "Vision600_thorax" / sdir_name
374
365
metrics = [MetricsWithTimeout (outdir = outdir )]
375
366
elif ds == 3 :
376
367
srcdir = SRCDIR / "Siemens_mMR_ACR"
377
- outdir = (
378
- OUTDIR
379
- / "Siemens_mMR_ACR"
380
- / f"{ formatted_datetime } _ss_{ step_size } _n_{ num_iter } _subs_{ num_subsets } "
381
- )
368
+ outdir = OUTDIR / "Siemens_mMR_ACR" / sdir_name
382
369
metrics = [MetricsWithTimeout (outdir = outdir )]
383
370
else :
384
371
raise ValueError (f"Unknown data set { ds } " )
@@ -446,6 +433,7 @@ def test_petric(
446
433
num_subsets = num_subsets ,
447
434
complete_gradient_epochs = complete_gradient_epochs ,
448
435
precond_update_epochs = precond_update_epochs ,
436
+ precond_hessian_factor = precond_hessian_factor ,
449
437
)
450
438
algo .run (num_iter , callbacks = metrics + submission_callbacks )
451
439
@@ -489,51 +477,58 @@ def test_petric(
489
477
precond_update_epochs = precond_update_epochs ,
490
478
)
491
479
else :
492
- for step_size in [1.0 , 1.5 ]:
493
- # data set 0 "mMR_NEMA_IQ" - num views 252
494
- for num_subsets in [28 ]:
495
- test_petric (
496
- step_size = step_size ,
497
- ds = 0 ,
498
- num_iter = 300 ,
499
- num_subsets = num_subsets ,
500
- metric_period = num_subsets ,
501
- complete_gradient_epochs = complete_gradient_epochs ,
502
- precond_update_epochs = precond_update_epochs ,
503
- )
504
-
505
- # data set 1 "neuro LF" - num views 128
506
- for num_subsets in [16 ]:
507
- test_petric (
508
- step_size = step_size ,
509
- ds = 1 ,
510
- num_iter = 300 ,
511
- num_subsets = num_subsets ,
512
- metric_period = num_subsets ,
513
- complete_gradient_epochs = complete_gradient_epochs ,
514
- precond_update_epochs = precond_update_epochs ,
515
- )
516
-
517
- # data set 2 "vision" - num views 50
518
- for num_subsets in [25 ]:
519
- test_petric (
520
- step_size = step_size ,
521
- ds = 2 ,
522
- num_iter = 200 ,
523
- num_subsets = num_subsets ,
524
- metric_period = num_subsets ,
525
- complete_gradient_epochs = complete_gradient_epochs ,
526
- precond_update_epochs = precond_update_epochs ,
527
- )
528
-
529
- # data set 4 "mMR_ACR" - num views 252
530
- for num_subsets in [28 ]:
531
- test_petric (
532
- step_size = 1.0 ,
533
- ds = 3 ,
534
- num_iter = 3 * 28 + 1 ,
535
- num_subsets = num_subsets ,
536
- metric_period = num_subsets ,
537
- complete_gradient_epochs = complete_gradient_epochs ,
538
- precond_update_epochs = precond_update_epochs ,
539
- )
480
+ # for phf in [8.0, 32.0, 4.0]:
481
+ for phf in [16 ]:
482
+ for step_size in [1.0 ]:
483
+ # data set 0 "mMR_NEMA_IQ" - num views 252
484
+ for num_subsets in [28 ]:
485
+ test_petric (
486
+ step_size = step_size ,
487
+ ds = 0 ,
488
+ num_iter = 300 ,
489
+ num_subsets = num_subsets ,
490
+ metric_period = num_subsets ,
491
+ complete_gradient_epochs = complete_gradient_epochs ,
492
+ precond_update_epochs = precond_update_epochs ,
493
+ precond_hessian_factor = phf ,
494
+ )
495
+
496
+ # # data set 1 "neuro LF" - num views 128
497
+ # for num_subsets in [32]:
498
+ # test_petric(
499
+ # step_size=step_size,
500
+ # ds=1,
501
+ # num_iter=300,
502
+ # num_subsets=num_subsets,
503
+ # metric_period=num_subsets,
504
+ # complete_gradient_epochs=complete_gradient_epochs,
505
+ # precond_update_epochs=precond_update_epochs,
506
+ # precond_hessian_factor=phf,
507
+ # )
508
+ #
509
+ # # data set 2 "vision" - num views 50
510
+ # for num_subsets in [25]:
511
+ # test_petric(
512
+ # step_size=step_size,
513
+ # ds=2,
514
+ # num_iter=300,
515
+ # num_subsets=num_subsets,
516
+ # metric_period=num_subsets,
517
+ # complete_gradient_epochs=complete_gradient_epochs,
518
+ # precond_update_epochs=precond_update_epochs,
519
+ # precond_hessian_factor=phf,
520
+ # )
521
+ #
522
+ # # data set 4 "mMR_ACR" - num views 252
523
+ # for num_subsets in [28]:
524
+ # test_petric(
525
+ # step_size=step_size,
526
+ # ds=3,
527
+ # num_iter=300,
528
+ # num_subsets=num_subsets,
529
+ # metric_period=num_subsets,
530
+ # complete_gradient_epochs=complete_gradient_epochs,
531
+ # precond_update_epochs=precond_update_epochs,
532
+ # precond_hessian_factor=phf,
533
+ # )
534
+ #
0 commit comments