Skip to content

Commit 8f7d706

Browse files
committed
COMP: Updates for linux aarch64 builds
We need to upgracde almalinux-release to get new GPG keys so we can install the sudo and ninja-build packages. We need to update the cmake version for better Python Stable ABI support to build the 3.11 wheels. We need to upgrade pip in the image so it knows how to install the Stable ABI wheels. We no-longer remove the old wheels after running auditwheel because they start with the same name.
1 parent e80c375 commit 8f7d706

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ if(ITKPythonPackage_SUPERBUILD)
9494

9595
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
9696

97-
# release branch, 2024-04-08
98-
set(ITK_GIT_TAG "v5.4rc03")
97+
# master branch, 2024-04-12
98+
set(ITK_GIT_TAG "81be125a547ba2fa2343ae36cce8812bd711c5b4")
9999

100100
#-----------------------------------------------------------------------------
101101
# A separate project is used to download ITK, so that it can reused

scripts/internal/manylinux-aarch64-build-module-wheels.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
# Run this script inside a dockcross container to build Python wheels for an aarch ITK module.
44
cd /work
5+
# Update GPG keys
6+
dnf upgrade -y almalinux-release
7+
# Newer Python.cmake module required for SABI
8+
pipx upgrade cmake
59
yum -y install sudo ninja-build
610
/opt/python/cp39-cp39/bin/python -m pip install -r /ITKPythonPackage/requirements-dev.txt
711
for PYBIN in "${PYBINARIES[@]}"; do

scripts/internal/manylinux-build-wheels.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,18 @@ if test "${ARCH}" == "x64"; then
181181
else
182182
for whl in dist/itk_*$(uname -m).whl; do
183183
auditwheel repair ${whl} -w /work/dist/
184-
rm ${whl}
185184
done
186185
fi
187186

188187
# Install packages and test
189188
for PYBIN in "${PYBINARIES[@]}"; do
190189
${PYBIN}/pip install --user numpy
190+
${PYBIN}/pip install --upgrade pip
191191
${PYBIN}/pip install itk --user --no-cache-dir --no-index -f /work/dist
192192
(cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')
193193
(cd $HOME && ${PYBIN}/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')
194194
(cd $HOME && ${PYBIN}/python -c 'import itkConfig; itkConfig.LazyLoading = False; import itk;')
195195
(cd $HOME && ${PYBIN}/python ${script_dir}/../../docs/code/test.py )
196196
done
197197

198-
rm -f dist/numpy*.whl
198+
rm -f dist/numpy*.whl

0 commit comments

Comments
 (0)