Skip to content

Commit 7c869c4

Browse files
tbirdsotbirdso
authored
Merge pull request #25 from InsightSoftwareConsortium/bump-itk
ENH: Bump ITK to v5.3rc04
2 parents ba1417c + f98ff9d commit 7c869c4

File tree

4 files changed

+27
-33
lines changed

4 files changed

+27
-33
lines changed

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Build, test, package
22

33
on: [push,pull_request]
44

5+
env:
6+
itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5"
7+
itk-wheel-tag: "v5.3rc04"
8+
59
jobs:
610
build-test-cxx:
711
runs-on: ${{ matrix.os }}
@@ -13,17 +17,14 @@ jobs:
1317
- os: ubuntu-18.04
1418
c-compiler: "gcc"
1519
cxx-compiler: "g++"
16-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
1720
cmake-build-type: "MinSizeRel"
1821
- os: windows-2019
1922
c-compiler: "cl.exe"
2023
cxx-compiler: "cl.exe"
21-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
2224
cmake-build-type: "Release"
2325
- os: macos-10.15
2426
c-compiler: "clang"
2527
cxx-compiler: "clang++"
26-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
2728
cmake-build-type: "MinSizeRel"
2829

2930
steps:
@@ -47,7 +48,7 @@ jobs:
4748
cd ..
4849
git clone https://github.com/InsightSoftwareConsortium/ITK.git
4950
cd ITK
50-
git checkout ${{ matrix.itk-git-tag }}
51+
git checkout ${{ env.itk-git-tag }}
5152
5253
- name: Build ITK
5354
if: matrix.os != 'windows-2019'
@@ -134,9 +135,7 @@ jobs:
134135
strategy:
135136
max-parallel: 2
136137
matrix:
137-
python-version: [36, 37, 38, 39]
138-
include:
139-
- itk-python-git-tag: "v5.2.0.post2"
138+
python-version: [37, 38, 39, 310]
140139

141140
steps:
142141
- uses: actions/checkout@v2
@@ -157,7 +156,7 @@ jobs:
157156
158157
- name: 'Build 🐍 Python 📦 package'
159158
run: |
160-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
159+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
161160
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
162161
163162
- name: Publish Python package as GitHub Artifact
@@ -170,9 +169,6 @@ jobs:
170169
runs-on: macos-10.15
171170
strategy:
172171
max-parallel: 2
173-
matrix:
174-
include:
175-
- itk-python-git-tag: "v5.2.0.post2"
176172

177173
steps:
178174
- uses: actions/checkout@v2
@@ -191,7 +187,7 @@ jobs:
191187
192188
- name: 'Build 🐍 Python 📦 package'
193189
run: |
194-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
190+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
195191
export MACOSX_DEPLOYMENT_TARGET=10.9
196192
./macpython-download-cache-and-build-module-wheels.sh
197193
@@ -206,9 +202,7 @@ jobs:
206202
strategy:
207203
max-parallel: 2
208204
matrix:
209-
python-version-minor: [6, 7, 8, 9]
210-
include:
211-
- itk-python-git-tag: "v5.2.0.post2"
205+
python-version-minor: [7, 8, 9, 10]
212206

213207
steps:
214208
- name: Get specific version of CMake, Ninja
@@ -229,7 +223,7 @@ jobs:
229223
run: |
230224
mv im ../../
231225
cd ../../
232-
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
226+
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ env.itk-wheel-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
233227
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
234228
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
235229
7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
@@ -241,7 +235,7 @@ jobs:
241235
run: |
242236
cd ../../im
243237
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
244-
set PATH="C:\P\grep;%PATH%"
238+
set PATH=C:\P\grep;%PATH%
245239
set CC=cl.exe
246240
set CXX=cl.exe
247241
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup

‎include/itkImageToImageOfVectorsFilter.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ namespace itk
4848
*
4949
* \ingroup BSplineGradient
5050
*/
51-
template <typename TInputImage, unsigned int NComponents = 3>
51+
template <typename TInputImage, unsigned int VComponents = 3>
5252
class ITK_TEMPLATE_EXPORT ImageToImageOfVectorsFilter
5353
: public ImageToImageFilter<
5454
TInputImage,
55-
Image<Vector<typename TInputImage::InternalPixelType, NComponents>, TInputImage::ImageDimension>>
55+
Image<Vector<typename TInputImage::InternalPixelType, VComponents>, TInputImage::ImageDimension>>
5656
{
5757
public:
5858
ITK_DISALLOW_COPY_AND_MOVE(ImageToImageOfVectorsFilter);
5959

6060
using Superclass = ImageToImageFilter<
6161
TInputImage,
62-
Image<Vector<typename TInputImage::InternalPixelType, NComponents>, TInputImage::ImageDimension>>;
62+
Image<Vector<typename TInputImage::InternalPixelType, VComponents>, TInputImage::ImageDimension>>;
6363
using Self = ImageToImageOfVectorsFilter;
6464
using Pointer = SmartPointer<Self>;
6565
using ConstPointer = SmartPointer<const Self>;
@@ -71,7 +71,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageOfVectorsFilter
7171

7272
using InputPixelType = typename InputImageType::InternalPixelType;
7373

74-
using OutputPixelType = Vector<InputPixelType, NComponents>;
74+
using OutputPixelType = Vector<InputPixelType, VComponents>;
7575
using OutputImageType = Image<OutputPixelType, ImageDimension>;
7676
using RegionType = typename OutputImageType::RegionType;
7777

‎include/itkImageToImageOfVectorsFilter.hxx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@
2424
namespace itk
2525
{
2626

27-
template <typename TInputImage, unsigned int NComponents>
28-
ImageToImageOfVectorsFilter<TInputImage, NComponents>::ImageToImageOfVectorsFilter()
27+
template <typename TInputImage, unsigned int VComponents>
28+
ImageToImageOfVectorsFilter<TInputImage, VComponents>::ImageToImageOfVectorsFilter()
2929
{
3030
// At least 1 input is required.
3131
this->SetNumberOfRequiredInputs(1);
3232
}
3333

34-
template <typename TInputImage, unsigned int NComponents>
34+
template <typename TInputImage, unsigned int VComponents>
3535
void
36-
ImageToImageOfVectorsFilter<TInputImage, NComponents>::BeforeThreadedGenerateData()
36+
ImageToImageOfVectorsFilter<TInputImage, VComponents>::BeforeThreadedGenerateData()
3737
{
3838
RegionType region;
3939

40-
for (unsigned int i = 0; i < NComponents; i++)
40+
for (unsigned int i = 0; i < VComponents; i++)
4141
{
4242
auto * input = static_cast<InputImageType *>(this->ProcessObject::GetInput(i));
4343
if (!input)
@@ -55,9 +55,9 @@ ImageToImageOfVectorsFilter<TInputImage, NComponents>::BeforeThreadedGenerateDat
5555
}
5656
}
5757

58-
template <typename TInputImage, unsigned int NComponents>
58+
template <typename TInputImage, unsigned int VComponents>
5959
void
60-
ImageToImageOfVectorsFilter<TInputImage, NComponents>::DynamicThreadedGenerateData(
60+
ImageToImageOfVectorsFilter<TInputImage, VComponents>::DynamicThreadedGenerateData(
6161
const RegionType & outputRegionForThread)
6262
{
6363
typename OutputImageType::Pointer outputImage = static_cast<OutputImageType *>(this->ProcessObject::GetOutput(0));
@@ -68,7 +68,7 @@ ImageToImageOfVectorsFilter<TInputImage, NComponents>::DynamicThreadedGenerateDa
6868
using InputIteratorType = ImageRegionConstIterator<InputImageType>;
6969
std::vector<InputIteratorType *> inputItContainer;
7070

71-
for (unsigned int i = 0; i < NComponents; i++)
71+
for (unsigned int i = 0; i < VComponents; i++)
7272
{
7373
typename InputImageType::Pointer inputImagePointer =
7474
static_cast<InputImageType *>(this->ProcessObject::GetInput(i));
@@ -81,7 +81,7 @@ ImageToImageOfVectorsFilter<TInputImage, NComponents>::DynamicThreadedGenerateDa
8181
typename OutputImageType::PixelType pix;
8282
while (!oit.IsAtEnd())
8383
{
84-
for (unsigned int i = 0; i < NComponents; i++)
84+
for (unsigned int i = 0; i < VComponents; i++)
8585
{
8686
pix[i] = inputItContainer[i]->Get();
8787
++(*inputItContainer[i]);
@@ -90,7 +90,7 @@ ImageToImageOfVectorsFilter<TInputImage, NComponents>::DynamicThreadedGenerateDa
9090
++oit;
9191
}
9292

93-
for (unsigned int i = 0; i < NComponents; i++)
93+
for (unsigned int i = 0; i < VComponents; i++)
9494
{
9595
delete inputItContainer[i];
9696
}

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
setup(
1515
name='itk-bsplinegradient',
16-
version='0.2.5',
16+
version='0.2.6',
1717
author='Matthew McCormick',
1818
author_email='matt.mccormick@kitware.com',
1919
packages=['itk'],
@@ -46,6 +46,6 @@
4646
keywords='ITK InsightToolkit Image-Gradient B-spline',
4747
url=r'https://github.com/InsightSoftwareConsortium/ITKBSplineGradient',
4848
install_requires=[
49-
r'itk>=v5.2.0.post2'
49+
r'itk>=v5.3rc04'
5050
]
5151
)

0 commit comments

Comments
 (0)