WIP: Verbose manylinux version

InsightSoftwareConsortium · Nov 30, 2022 · 1ea8d9c · 1ea8d9c
1 parent 523c09e
commit 1ea8d9c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -16,9 +16,17 @@
 #   export LD_LIBRARY_PATH="/path/to/OpenCL.so:/path/to/OpenCL.so.1.2"
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
+# A specialized manylinux image and tag can be used by exporting to MANYLINUX_VERSION before
+# running this script. Default is _2_28.
+#
+# For example,
+#
+#   export MANYLINUX_VERSION=2014
+#   export IMAGE_TAG=20221108-102ebcc
+#   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 
-MANYLINUX_VERSION=_2_28
-IMAGE_TAG=20221108-102ebcc
+MANYLINUX_VERSION=${MANYLINUX_VERSION:=_2_28}
+IMAGE_TAG=${IMAGE_TAG:=20221108-102ebcc}
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64

diff --git a/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh b/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh
@@ -5,8 +5,11 @@
 #
 # Variables to be set outside of the:
 # - ITK_PACKAGE_VERSION: Tag for ITKPythonBuilds build archive to use
-# - TARBALL_SPECIALIZATION: manylinux specialization to use
-#     Examples: "-manylinux_2_28", "-manylinux2014", "-manylinux_2_28_aarch64"
+#     Examples: "v5.3.0", "v5.2.1.post1"
+#     See available tags at https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/tags
+# - MANYLINUX_VERSION: manylinux specialization to use
+#     Examples: "_2_28", "2014", "_2_28_aarch64"
+#     See https://github.com/dockcross/dockcross
 # - ITKPYTHONPACKAGE_TAG: Tag for ITKPythonPackage build scripts to use.
 #     If ITKPYTHONPACKAGE_TAG is empty then the default scripts distributed
 #     with the ITKPythonBuilds archive will be used.
@@ -57,9 +60,14 @@ fi
 # Expect unzstd > v1.3.2, see discussion in `dockcross-manylinux-build-tarball.sh`
 ${unzstd_exe} --version
 
+
+# -----------------------------------------------------------------------
+
+TARBALL_SPECIALIZATION="-manylinux${MANYLINUX_VERSION:=_2_28}"
 TARBALL_NAME="ITKPythonBuilds-linux${TARBALL_SPECIALIZATION}.tar"
 
 if [[ ! -f ${TARBALL_NAME}.zst ]]; then
+  echo "Fetching https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.3.0}/${TARBALL_NAME}.zst"
   curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.3.0}/${TARBALL_NAME}.zst -O
 fi
 if [[ ! -f ./${TARBALL_NAME}.zst ]]; then
@@ -100,7 +108,7 @@ fi
 cp -a ITKPythonPackage/oneTBB-prefix ./
 
 set -- "${FORWARD_ARGS[@]}"; # Restore initial argument list
-if [[ "${TARBALL_SPECIALIZATION}" = "-manylinux_2_28_aarch64" ]]; then
+if [[ "${MANYLINUX_VERSION}" = "_2_28_aarch64" ]]; then
   ./ITKPythonPackage/scripts/manylinux_2_28_aarch64-build-module-wheels.sh "$@"
 else
   ./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh "$@"

diff --git a/scripts/manylinux_2_28_aarch64-build-module-wheels.sh b/scripts/manylinux_2_28_aarch64-build-module-wheels.sh
@@ -16,9 +16,17 @@
 #   export LD_LIBRARY_PATH="/path/to/OpenCL.so:/path/to/OpenCL.so.1.2"
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
+# A specialized manylinux image and tag can be used by exporting to MANYLINUX_VERSION before
+# running this script. Default is _2_28_aarch64.
+#
+# For example,
+#
+#   export MANYLINUX_VERSION=2014
+#   export IMAGE_TAG=20221108-102ebcc
+#   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 
-MANYLINUX_VERSION=_2_28
-IMAGE_TAG=latest
+MANYLINUX_VERSION=${MANYLINUX_VERSION:=_2_28_aarch64}
+IMAGE_TAG=${IMAGE_TAG:=latest}
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
 
@@ -35,4 +43,4 @@ if [[ -n ${LD_LIBRARY_PATH} ]]; then
 fi
 
 docker run --privileged --rm tonistiigi/binfmt --install all
-docker run --rm -it $DOCKER_ARGS -v $(pwd):/work/ quay.io/pypa/manylinux${MANYLINUX_VERSION}_aarch64:${IMAGE_TAG} "/ITKPythonPackage/scripts/internal/manylinux-aarch64-build-module-wheels.sh" "$@"
+docker run --rm -it $DOCKER_ARGS -v $(pwd):/work/ quay.io/pypa/manylinux${MANYLINUX_VERSION}:${IMAGE_TAG} "/ITKPythonPackage/scripts/internal/manylinux-aarch64-build-module-wheels.sh" "$@"