Skip to content

Commit 71a26cd

Browse files
committed
ENH: Add ITKMeshToPolyData dependency from ITKBSplineGradient
Reflect ITKBSplineGradient dependency update introduced in InsightSoftwareConsortium/ITKBSplineGradient@bd26924
1 parent b20cd45 commit 71a26cd

2 files changed

Lines changed: 39 additions & 4 deletions

File tree

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

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on: [push,pull_request]
55
env:
66
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
77
itk-wheel-tag: "v5.3rc04"
8+
ITKMeshToPolyData-git-tag: v0.8.2
89
ITKBSplineGradient-git-tag: v0.2.4
910
ITKHigherOrderAccurateGradient-git-tag: v1.1.0
1011
ITKSplitComponents-git-tag: v2.0.4
@@ -60,7 +61,7 @@ jobs:
6061
cd ..
6162
mkdir ITK-build
6263
cd ITK-build
63-
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_SplitComponents:BOOL=ON -DModule_BSplineGradient:BOOL=ON -DModule_Strain:BOOL=ON -DModule_HigherOrderAccurateGradient:BOOL=ON -GNinja ../ITK
64+
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_MeshToPolyData:BOOL=ON -DModule_SplitComponents:BOOL=ON -DModule_BSplineGradient:BOOL=ON -DModule_Strain:BOOL=ON -DModule_HigherOrderAccurateGradient:BOOL=ON -GNinja ../ITK
6465
ninja
6566
6667
- name: Build ITK
@@ -70,7 +71,7 @@ jobs:
7071
mkdir ITK-build
7172
cd ITK-build
7273
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
73-
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_SplitComponents:BOOL=ON -DModule_BSplineGradient:BOOL=ON -DModule_Strain:BOOL=ON -DModule_HigherOrderAccurateGradient:BOOL=ON -GNinja ../ITK
74+
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_MeshToPolyData:BOOL=ON -DModule_SplitComponents:BOOL=ON -DModule_BSplineGradient:BOOL=ON -DModule_Strain:BOOL=ON -DModule_HigherOrderAccurateGradient:BOOL=ON -GNinja ../ITK
7475
ninja
7576
shell: cmd
7677

@@ -166,15 +167,26 @@ jobs:
166167
- name: 'Build 🐍 Python 📦 package'
167168
run: |
168169
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
170+
pwd
171+
echo "Building ITK external module dependencies"
172+
git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git
173+
cp ./dockcross-manylinux-download-cache-and-build-module-wheels.sh ./ITKMeshToPolyData
174+
pushd ITKMeshToPolyData
175+
git checkout ${{env.ITKMeshToPolyData-git-tag}}
176+
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
177+
popd
178+
cp ITKMeshToPolyData/include/* include/
179+
rm ./ITKMeshToPolyData/ITKPythonBuilds-linux.tar.zst
180+
mv ./ITKMeshToPolyData/ITKPythonPackage .
169181
git clone https://github.com/InsightSoftwareConsortium/ITKBSplineGradient.git
170182
cp ./dockcross-manylinux-download-cache-and-build-module-wheels.sh ./ITKBSplineGradient
171183
pushd ITKBSplineGradient
172184
git checkout ${{env.ITKBSplineGradient-git-tag}}
185+
ln -s ../ITKPythonPackage
186+
ln -s ./ITKPythonPackage/oneTBB-prefix
173187
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
174188
popd
175189
cp ITKBSplineGradient/include/* include/
176-
rm ./ITKBSplineGradient/ITKPythonBuilds-linux.tar.zst
177-
mv ./ITKBSplineGradient/ITKPythonPackage .
178190
git clone https://github.com/InsightSoftwareConsortium/ITKHigherOrderAccurateGradient.git
179191
pushd ITKHigherOrderAccurateGradient
180192
git checkout ${{env.ITKHigherOrderAccurateGradient-git-tag}}
@@ -199,6 +211,7 @@ jobs:
199211
./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh cp${{ matrix.python-version }}
200212
popd
201213
cp ITKStrain/include/* include/
214+
echo "Building ITKUltrasound module wheels"
202215
pwd
203216
ls -l
204217
du -sh ./* | sort -hr | head -n 20
@@ -235,6 +248,16 @@ jobs:
235248
run: |
236249
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
237250
export MACOSX_DEPLOYMENT_TARGET=10.9
251+
pwd
252+
echo "Building ITK external module dependencies"
253+
git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData
254+
cp ./macpython-download-cache-and-build-module-wheels.sh ITKMeshToPolyData/
255+
pushd ITKMeshToPolyData
256+
git checkout ${{env.ITKMeshToPolyData-git-tag}}
257+
./macpython-download-cache-and-build-module-wheels.sh
258+
popd
259+
cp ITKMeshToPolyData/include/* include/
260+
rm ./ITKMeshToPolyData/ITKPythonBuilds-macosx.tar.zst
238261
git clone https://github.com/InsightSoftwareConsortium/ITKBSplineGradient
239262
cp ./macpython-download-cache-and-build-module-wheels.sh ITKBSplineGradient/
240263
pushd ITKBSplineGradient
@@ -261,6 +284,7 @@ jobs:
261284
/Users/svc-dashboard/D/P/ITKPythonPackage/scripts/macpython-build-module-wheels.sh
262285
popd
263286
cp ITKStrain/include/* include/
287+
echo "Building ITKUltrasound module wheels"
264288
/Users/svc-dashboard/D/P/ITKPythonPackage/scripts/macpython-build-module-wheels.sh
265289
266290
- name: Publish Python package as GitHub Artifact
@@ -301,6 +325,8 @@ jobs:
301325
7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
302326
curl -L "https://data.kitware.com/api/v1/file/5bbf87ba8d777f06b91f27d6/download/grep-win.zip" -o "grep-win.zip"
303327
7z x grep-win.zip -o/c/P/grep -aoa -r
328+
pwd
329+
git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git
304330
git clone https://github.com/InsightSoftwareConsortium/ITKBSplineGradient.git
305331
git clone https://github.com/InsightSoftwareConsortium/ITKHigherOrderAccurateGradient.git
306332
git clone https://github.com/InsightSoftwareConsortium/ITKSplitComponents.git
@@ -314,6 +340,13 @@ jobs:
314340
set PATH=C:\P\grep;%PATH%
315341
set CC=cl.exe
316342
set CXX=cl.exe
343+
pwd
344+
echo "Building ITK external module dependencies"
345+
cd ITKMeshToPolyData
346+
"C:\Program Files\Git\bin\git.exe" checkout ${{env.ITKMeshToPolyData-git-tag}}
347+
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
348+
cd ..
349+
copy ITKMeshToPolyData/include/* include/
317350
cd ITKBSplineGradient
318351
"C:\Program Files\Git\bin\git.exe" checkout ${{env.ITKBSplineGradient-git-tag}}
319352
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
@@ -334,6 +367,7 @@ jobs:
334367
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
335368
cd ..
336369
copy ITKStrain/include/* include/
370+
echo "Building ITKUltrasound module wheels"
337371
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
338372
339373
- name: Publish Python package as GitHub Artifact

itk-module.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ itk_module(Ultrasound
1818
${_fft_depends}
1919
COMPILE_DEPENDS
2020
SplitComponents
21+
MeshToPolyData
2122
BSplineGradient
2223
HigherOrderAccurateGradient
2324
Strain

0 commit comments

Comments
 (0)