Skip to content

Commit 3b00b35

Browse files
thewtexthewtex
authored
Merge pull request #136 from mseng10/update-ci
COMP: Update GitHub Actions from ITKModuleTemplate
2 parents 47650d6 + ba3279c commit 3b00b35

12 files changed

+45
-29
lines changed

‎.github/workflows/build-test-package.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
- os: ubuntu-18.04
1414
c-compiler: "gcc"
1515
cxx-compiler: "g++"
16-
itk-git-tag: "v5.1.1"
16+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
1717
cmake-build-type: "MinSizeRel"
1818
- os: windows-2019
1919
c-compiler: "cl.exe"
2020
cxx-compiler: "cl.exe"
21-
itk-git-tag: "v5.1.1"
21+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
2222
cmake-build-type: "Release"
2323
- os: macos-10.15
2424
c-compiler: "clang"
2525
cxx-compiler: "clang++"
26-
itk-git-tag: "v5.1.1"
26+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -39,6 +39,9 @@ jobs:
3939
python -m pip install --upgrade pip
4040
python -m pip install ninja
4141
42+
- name: Get specific version of CMake, Ninja
43+
uses: lukka/get-cmake@v3.18.3
44+
4245
- name: Download ITK
4346
run: |
4447
cd ..

‎include/itkWaveletFrequencyForward.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ class WaveletFrequencyForward : public ImageToImageFilter<TInputImage, TOutputIm
114114

115115
/** Flag to store the wavelet Filter Bank Pyramid, for all levels and all bands.
116116
* Access to it with GetWaveletFilterBankPyramid()*/
117-
itkSetMacro(StoreWaveletFilterBankPyramid, bool); itkGetMacro(StoreWaveletFilterBankPyramid, bool);
118-
itkBooleanMacro(StoreWaveletFilterBankPyramid);
117+
itkSetMacro(StoreWaveletFilterBankPyramid, bool);
118+
itkGetMacro(StoreWaveletFilterBankPyramid, bool);
119+
itkBooleanMacro(StoreWaveletFilterBankPyramid);
119120

120121
itkGetMacro(WaveletFilterBankPyramid, OutputsType);
121122

‎include/itkWaveletFrequencyForwardUndecimated.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ class WaveletFrequencyForwardUndecimated : public ImageToImageFilter<TInputImage
106106

107107
/** Flag to store the wavelet Filter Bank Pyramid, for all levels and all bands.
108108
* Access to it with GetWaveletFilterBankPyramid()*/
109-
itkSetMacro(StoreWaveletFilterBankPyramid, bool); itkGetMacro(StoreWaveletFilterBankPyramid, bool);
110-
itkBooleanMacro(StoreWaveletFilterBankPyramid);
109+
itkSetMacro(StoreWaveletFilterBankPyramid, bool);
110+
itkGetMacro(StoreWaveletFilterBankPyramid, bool);
111+
itkBooleanMacro(StoreWaveletFilterBankPyramid);
111112

112113
itkGetMacro(WaveletFilterBankPyramid, OutputsType);
113114

‎include/itkWaveletFrequencyInverse.h‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,18 @@ class WaveletFrequencyInverse : public ImageToImageFilter<TInputImage, TOutputIm
9494
* Set to 2 (dyadic), not modifiable, but providing future flexibility */
9595
itkGetConstReferenceMacro(ScaleFactor, unsigned int);
9696

97-
/**
98-
* If On, applies to each input the appropiate Level-Band multiplicative factor. Needed for perfect reconstruction.
99-
* It has to be turned off for some applications (phase analysis for example) */
100-
itkGetConstReferenceMacro(ApplyReconstructionFactors, bool); itkSetMacro(ApplyReconstructionFactors, bool);
101-
itkBooleanMacro(ApplyReconstructionFactors);
97+
/**
98+
* If On, applies to each input the appropiate Level-Band multiplicative factor. Needed for perfect reconstruction.
99+
* It has to be turned off for some applications (phase analysis for example) */
100+
itkGetConstReferenceMacro(ApplyReconstructionFactors, bool);
101+
itkSetMacro(ApplyReconstructionFactors, bool);
102+
itkBooleanMacro(ApplyReconstructionFactors);
102103

103104
/** Flag to use external WaveletFilterBankPyramid generated in ForwardWavelet.
104105
* Requires to use SetWaveletFilterBankPyramid. */
105-
itkGetConstReferenceMacro(UseWaveletFilterBankPyramid, bool); itkSetMacro(UseWaveletFilterBankPyramid, bool);
106-
itkBooleanMacro(UseWaveletFilterBankPyramid);
106+
itkGetConstReferenceMacro(UseWaveletFilterBankPyramid, bool);
107+
itkSetMacro(UseWaveletFilterBankPyramid, bool);
108+
itkBooleanMacro(UseWaveletFilterBankPyramid);
107109

108110
/**
109111
* Set vector containing the WaveletFilterBankPyramid.

‎include/itkWaveletFrequencyInverseUndecimated.h‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,18 @@ class WaveletFrequencyInverseUndecimated : public ImageToImageFilter<TInputImage
8686
* Set to 2 (dyadic), not modifiable, but providing future flexibility */
8787
itkGetConstReferenceMacro(ScaleFactor, unsigned int);
8888

89-
/**
90-
* If On, applies to each input the appropiate Level-Band multiplicative factor. Needed for perfect reconstruction.
91-
* It has to be turned off for some applications (phase analysis for example) */
92-
itkGetConstReferenceMacro(ApplyReconstructionFactors, bool); itkSetMacro(ApplyReconstructionFactors, bool);
93-
itkBooleanMacro(ApplyReconstructionFactors);
89+
/**
90+
* If On, applies to each input the appropiate Level-Band multiplicative factor. Needed for perfect reconstruction.
91+
* It has to be turned off for some applications (phase analysis for example) */
92+
itkGetConstReferenceMacro(ApplyReconstructionFactors, bool);
93+
itkSetMacro(ApplyReconstructionFactors, bool);
94+
itkBooleanMacro(ApplyReconstructionFactors);
9495

9596
/** Flag to use external WaveletFilterBankPyramid generated in ForwardWavelet.
9697
* Requires to use SetWaveletFilterBankPyramid. */
97-
itkGetConstReferenceMacro(UseWaveletFilterBankPyramid, bool); itkSetMacro(UseWaveletFilterBankPyramid, bool);
98-
itkBooleanMacro(UseWaveletFilterBankPyramid);
98+
itkGetConstReferenceMacro(UseWaveletFilterBankPyramid, bool);
99+
itkSetMacro(UseWaveletFilterBankPyramid, bool);
100+
itkBooleanMacro(UseWaveletFilterBankPyramid);
99101

100102
/**
101103
* Set vector containing the WaveletFilterBankPyramid.

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@
5454
keywords='ITK InsightToolkit Wavelet Pyramid Steerable Riesz',
5555
url=r'https://github.com/InsightSoftwareConsortium/ITKIsotropicWavelets',
5656
install_requires=[
57-
r'itk>=5.1.1',
57+
r'itk>=5.2rc1',
5858
]
5959
)

‎test/itkFrequencyExpandAndShrinkTest.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,14 @@ itkFrequencyExpandAndShrinkTest(int argc, char * argv[])
250250
using ExpandViaInverseFFTType = itk::FrequencyExpandViaInverseFFTImageFilter<ComplexImageType>;
251251
auto expandViaInverseFFTFilter = ExpandViaInverseFFTType::New();
252252

253-
ITK_EXERCISE_BASIC_OBJECT_METHODS(expandViaInverseFFTFilter, FrequencyExpandViaInverseFFTImageFilter, ImageToImageFilter);
253+
ITK_EXERCISE_BASIC_OBJECT_METHODS(
254+
expandViaInverseFFTFilter, FrequencyExpandViaInverseFFTImageFilter, ImageToImageFilter);
254255

255256
using ShrinkViaInverseFFTType = itk::FrequencyShrinkViaInverseFFTImageFilter<ComplexImageType>;
256257
auto shrinkViaInverseFFTFilter = ShrinkViaInverseFFTType::New();
257258

258-
ITK_EXERCISE_BASIC_OBJECT_METHODS(shrinkViaInverseFFTFilter, FrequencyShrinkViaInverseFFTImageFilter, ImageToImageFilter);
259+
ITK_EXERCISE_BASIC_OBJECT_METHODS(
260+
shrinkViaInverseFFTFilter, FrequencyShrinkViaInverseFFTImageFilter, ImageToImageFilter);
259261

260262
unsigned int dimension = 3;
261263
if (argc == 4)

‎test/itkRieszWaveletPhaseAnalysisTest.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ itkRieszWaveletPhaseAnalysisTest(int argc, char * argv[])
283283
simoncellidIsotropicWavelet, SimoncelliIsotropicWavelet, IsotropicWaveletFrequencyFunction);
284284

285285
auto shannonIsotropicWavelet = ShannonIsotropicWaveletType::New();
286-
ITK_EXERCISE_BASIC_OBJECT_METHODS(shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
286+
ITK_EXERCISE_BASIC_OBJECT_METHODS(
287+
shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
287288

288289
using HeldWavelet = itk::HeldIsotropicWavelet<>;
289290
using VowWavelet = itk::VowIsotropicWavelet<>;

‎test/itkWaveletFrequencyFilterBankGeneratorDownsampleTest.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ itkWaveletFrequencyFilterBankGeneratorDownsampleTest(int argc, char * argv[])
157157
simoncellidIsotropicWavelet, SimoncelliIsotropicWavelet, IsotropicWaveletFrequencyFunction);
158158

159159
auto shannonIsotropicWavelet = ShannonIsotropicWaveletType::New();
160-
ITK_EXERCISE_BASIC_OBJECT_METHODS(shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
160+
ITK_EXERCISE_BASIC_OBJECT_METHODS(
161+
shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
161162

162163
using HeldWavelet = itk::HeldIsotropicWavelet<>;
163164
using VowWavelet = itk::VowIsotropicWavelet<>;

‎test/itkWaveletFrequencyFilterBankGeneratorTest.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ itkWaveletFrequencyFilterBankGeneratorTest(int argc, char * argv[])
216216
simoncellidIsotropicWavelet, SimoncelliIsotropicWavelet, IsotropicWaveletFrequencyFunction);
217217

218218
auto shannonIsotropicWavelet = ShannonIsotropicWaveletType::New();
219-
ITK_EXERCISE_BASIC_OBJECT_METHODS(shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
219+
ITK_EXERCISE_BASIC_OBJECT_METHODS(
220+
shannonIsotropicWavelet, ShannonIsotropicWavelet, IsotropicWaveletFrequencyFunction);
220221

221222
using HeldWavelet = itk::HeldIsotropicWavelet<>;
222223
using VowWavelet = itk::VowIsotropicWavelet<>;

0 commit comments

Comments
 (0)