Skip to content

Commit 603d20c

Browse files
committed
Removed verbose input (only available in current master of ANTs). Will wait for next release to add.
1 parent 3f1d776 commit 603d20c

File tree

6 files changed

+15
-32
lines changed

6 files changed

+15
-32
lines changed

nipype/interfaces/ants/registration.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ class RegistrationInputSpec(ANTSCommandInputSpec):
380380
winsorize_lower_quantile = traits.Range(
381381
low=0.0, high=1.0, value=0.0, argstr='%s', usedefault=True, desc="The Lower quantile to clip image ranges")
382382

383-
# Verbose Output
384-
verbose = traits.Bool(True, argstr='--verbose %d', desc='enable verbose logging', usedefault=True)
385-
386383

387384
class RegistrationOutputSpec(TraitedSpec):
388385
forward_transforms = traits.List(
@@ -444,7 +441,7 @@ class Registration(ANTSCommand):
444441
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --transform SyN[ 0.25, 3.0, 0.0 ] \
445442
--metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] --convergence [ 100x50x30, 1e-09, 20 ] \
446443
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
447-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.025, 1.0 ] --write-composite-transform 1'
444+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.025, 1.0 ] --write-composite-transform 1'
448445
>>> reg1.run() # doctest: +SKIP
449446
450447
>>> reg2 = copy.deepcopy(reg)
@@ -457,7 +454,7 @@ class Registration(ANTSCommand):
457454
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --transform SyN[ 0.25, 3.0, 0.0 ] \
458455
--metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] --convergence [ 100x50x30, 1e-09, 20 ] \
459456
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
460-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 0.975 ] --write-composite-transform 1'
457+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 0.975 ] --write-composite-transform 1'
461458
462459
>>> reg3 = copy.deepcopy(reg)
463460
>>> reg3.inputs.winsorize_lower_quantile = 0.025
@@ -470,7 +467,7 @@ class Registration(ANTSCommand):
470467
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --transform SyN[ 0.25, 3.0, 0.0 ] \
471468
--metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] --convergence [ 100x50x30, 1e-09, 20 ] \
472469
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
473-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.025, 0.975 ] --write-composite-transform 1'
470+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.025, 0.975 ] --write-composite-transform 1'
474471
475472
>>> reg3a = copy.deepcopy(reg)
476473
>>> reg3a.inputs.float = True
@@ -482,7 +479,7 @@ class Registration(ANTSCommand):
482479
--smoothing-sigmas 1.0x0.0vox --shrink-factors 2x1 --use-estimate-learning-rate-once 1 --use-histogram-matching 1 \
483480
--transform SyN[ 0.25, 3.0, 0.0 ] --metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] \
484481
--convergence [ 100x50x30, 1e-09, 20 ] --smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 \
485-
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
482+
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
486483
--write-composite-transform 1'
487484
488485
>>> reg3b = copy.deepcopy(reg)
@@ -495,7 +492,7 @@ class Registration(ANTSCommand):
495492
--smoothing-sigmas 1.0x0.0vox --shrink-factors 2x1 --use-estimate-learning-rate-once 1 --use-histogram-matching 1 \
496493
--transform SyN[ 0.25, 3.0, 0.0 ] --metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] \
497494
--convergence [ 100x50x30, 1e-09, 20 ] --smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 \
498-
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
495+
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
499496
--write-composite-transform 1'
500497
501498
>>> # Test collapse transforms flag
@@ -523,7 +520,7 @@ class Registration(ANTSCommand):
523520
--smoothing-sigmas 1.0x0.0vox --shrink-factors 2x1 --use-estimate-learning-rate-once 1 --use-histogram-matching 1 \
524521
--transform SyN[ 0.25, 3.0, 0.0 ] --metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] \
525522
--convergence [ 100x50x30, 1e-09, 20 ] --smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 \
526-
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
523+
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
527524
--write-composite-transform 1'
528525
529526
>>> # Test collapse transforms flag
@@ -551,7 +548,7 @@ class Registration(ANTSCommand):
551548
--smoothing-sigmas 1.0x0.0vox --shrink-factors 2x1 --use-estimate-learning-rate-once 1 --use-histogram-matching 1 \
552549
--transform SyN[ 0.25, 3.0, 0.0 ] --metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] \
553550
--convergence [ 100x50x30, 1e-09, 20 ] --smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 \
554-
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
551+
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
555552
--write-composite-transform 0'
556553
557554
>>> # Test multiple metrics per stage
@@ -572,7 +569,7 @@ class Registration(ANTSCommand):
572569
--metric Mattes[ fixed1.nii, moving1.nii, 0.5, 32, None, 0.05 ] \
573570
--metric CC[ fixed1.nii, moving1.nii, 0.5, 4, None, 0.1 ] --convergence [ 100x50x30, 1e-09, 20 ] \
574571
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
575-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
572+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
576573
577574
>>> # Test multiple inputs
578575
>>> reg6 = copy.deepcopy(reg5)
@@ -587,7 +584,7 @@ class Registration(ANTSCommand):
587584
--metric Mattes[ fixed1.nii, moving1.nii, 0.5, 32, None, 0.05 ] \
588585
--metric CC[ fixed2.nii, moving2.nii, 0.5, 4, None, 0.1 ] --convergence [ 100x50x30, 1e-09, 20 ] \
589586
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
590-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
587+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
591588
592589
>>> # Test Interpolation Parameters (BSpline)
593590
>>> reg7a = copy.deepcopy(reg)
@@ -601,7 +598,7 @@ class Registration(ANTSCommand):
601598
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --transform SyN[ 0.25, 3.0, 0.0 ] \
602599
--metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] --convergence [ 100x50x30, 1e-09, 20 ] \
603600
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
604-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
601+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
605602
606603
>>> # Test Interpolation Parameters (MultiLabel/Gaussian)
607604
>>> reg7b = copy.deepcopy(reg)
@@ -615,7 +612,7 @@ class Registration(ANTSCommand):
615612
--smoothing-sigmas 1.0x0.0vox --shrink-factors 2x1 --use-estimate-learning-rate-once 1 --use-histogram-matching 1 \
616613
--transform SyN[ 0.25, 3.0, 0.0 ] --metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] \
617614
--convergence [ 100x50x30, 1e-09, 20 ] --smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 \
618-
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
615+
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] \
619616
--write-composite-transform 1'
620617
621618
>>> # Test Extended Transform Parameters
@@ -630,7 +627,7 @@ class Registration(ANTSCommand):
630627
--use-estimate-learning-rate-once 1 --use-histogram-matching 1 --transform BSplineSyN[ 0.25, 26, 0, 3 ] \
631628
--metric Mattes[ fixed1.nii, moving1.nii, 1, 32 ] --convergence [ 100x50x30, 1e-09, 20 ] \
632629
--smoothing-sigmas 2.0x1.0x0.0vox --shrink-factors 3x2x1 --use-estimate-learning-rate-once 1 \
633-
--use-histogram-matching 1 --verbose 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
630+
--use-histogram-matching 1 --winsorize-image-intensities [ 0.0, 1.0 ] --write-composite-transform 1'
634631
"""
635632
DEF_SAMPLING_STRATEGY = 'None'
636633
"""The default sampling strategy argument."""

nipype/interfaces/ants/resampling.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ class ApplyTransformsInputSpec(ANTSCommandInputSpec):
253253
print_out_composite_warp_file = traits.Bool(False, requires=["output_image"],
254254
desc='output a composite warp file instead of a transformed image')
255255
float = traits.Bool(argstr='--float %d', default=False, desc='Use float instead of double for computations.')
256-
# Verbose Output
257-
verbose = traits.Bool(True, argstr='--verbose %d', desc='enable verbose logging', usedefault=True)
258256

259257

260258
class ApplyTransformsOutputSpec(TraitedSpec):
@@ -281,7 +279,7 @@ class ApplyTransforms(ANTSCommand):
281279
>>> at.cmdline
282280
'antsApplyTransforms --default-value 0 --dimensionality 3 --input moving1.nii --interpolation Linear \
283281
--output deformed_moving1.nii --reference-image fixed1.nii --transform [ trans.mat, 0 ] \
284-
--transform [ ants_Warp.nii.gz, 0 ] --verbose 1'
282+
--transform [ ants_Warp.nii.gz, 0 ]'
285283
286284
>>> at1 = ApplyTransforms()
287285
>>> at1.inputs.dimension = 3
@@ -296,7 +294,7 @@ class ApplyTransforms(ANTSCommand):
296294
>>> at1.cmdline
297295
'antsApplyTransforms --default-value 0 --dimensionality 3 --input moving1.nii --interpolation BSpline[ 5 ] \
298296
--output deformed_moving1.nii --reference-image fixed1.nii --transform [ trans.mat, 0 ] \
299-
--transform [ ants_Warp.nii.gz, 0 ] --verbose 1'
297+
--transform [ ants_Warp.nii.gz, 0 ]'
300298
301299
302300
"""

nipype/interfaces/ants/segmentation.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ class AtroposInputSpec(ANTSCommandInputSpec):
5252
save_posteriors = traits.Bool()
5353
output_posteriors_name_template = traits.Str('POSTERIOR_%02d.nii.gz',
5454
usedefault=True)
55-
# Verbose Output
56-
verbose = traits.Bool(True, argstr='--verbose %d', desc='enable verbose logging', usedefault=True)
5755

5856

5957
class AtroposOutputSpec(TraitedSpec):
@@ -95,8 +93,7 @@ class Atropos(ANTSCommand):
9593
'Atropos --image-dimensionality 3 --icm [1,1] \
9694
--initialization PriorProbabilityImages[2,priors/priorProbImages%02d.nii,0.8,1e-07] --intensity-image structural.nii \
9795
--likelihood-model Gaussian --mask-image mask.nii --mrf [0.2,1x1x1] --convergence [5,1e-06] \
98-
--output [structural_labeled.nii,POSTERIOR_%02d.nii.gz] --posterior-formulation Socrates[1] --use-random-seed 1 \
99-
--verbose 1'
96+
--output [structural_labeled.nii,POSTERIOR_%02d.nii.gz] --posterior-formulation Socrates[1] --use-random-seed 1'
10097
"""
10198
input_spec = AtroposInputSpec
10299
output_spec = AtroposOutputSpec

nipype/interfaces/ants/tests/test_auto_ApplyTransforms.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ def test_ApplyTransforms_inputs():
4848
transforms=dict(argstr='%s',
4949
mandatory=True,
5050
),
51-
verbose=dict(argstr='--verbose %d',
52-
usedefault=True,
53-
),
5451
)
5552
inputs = ApplyTransforms.input_spec()
5653

nipype/interfaces/ants/tests/test_auto_Atropos.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ def test_Atropos_inputs():
6464
use_random_seed=dict(argstr='--use-random-seed %d',
6565
usedefault=True,
6666
),
67-
verbose=dict(argstr='--verbose %d',
68-
usedefault=True,
69-
),
7067
)
7168
inputs = Atropos.input_spec()
7269

nipype/interfaces/ants/tests/test_auto_Registration.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ def test_Registration_inputs():
104104
use_estimate_learning_rate_once=dict(),
105105
use_histogram_matching=dict(usedefault=True,
106106
),
107-
verbose=dict(argstr='--verbose %d',
108-
usedefault=True,
109-
),
110107
winsorize_lower_quantile=dict(argstr='%s',
111108
usedefault=True,
112109
),

0 commit comments

Comments
 (0)