Merge pull request #152 from thewtex/wrap-4d

Author: thewtex

CMakeLists.txt

@@ -226,6 +226,7 @@ if(ITKPythonPackage_SUPERBUILD)
         -DITK_WRAP_PYTHON:BOOL=ON
         -DITK_WRAP_unsigned_short:BOOL=ON
         -DITK_WRAP_double:BOOL=ON
+        -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4"
         -DITK_WRAP_DOC:BOOL=ON
         -DDOXYGEN_EXECUTABLE:FILEPATH=${DOXYGEN_EXECUTABLE}
         -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR}

docs/Build_ITK_Python_packages.rst

@@ -32,11 +32,11 @@ For example::
 	[...]
 
 	$ ls -1 dist/
-	itk-4.11.0.dev20170218-cp27-cp27m-manylinux1_x86_64.whl
-	itk-4.11.0.dev20170218-cp27-cp27mu-manylinux1_x86_64.whl
-	itk-4.11.0.dev20170218-cp34-cp34m-manylinux1_x86_64.whl
-	itk-4.11.0.dev20170218-cp35-cp35m-manylinux1_x86_64.whl
-	itk-4.11.0.dev20170218-cp36-cp36m-manylinux1_x86_64.whl
+	itk-4.11.0.dev20170218-cp27-cp27m-manylinux2014_x86_64.whl
+	itk-4.11.0.dev20170218-cp27-cp27mu-manylinux2014_x86_64.whl
+	itk-4.11.0.dev20170218-cp34-cp34m-manylinux2014_x86_64.whl
+	itk-4.11.0.dev20170218-cp35-cp35m-manylinux2014_x86_64.whl
+	itk-4.11.0.dev20170218-cp36-cp36m-manylinux2014_x86_64.whl
 
 macOS
 -----

scripts/dockcross-manylinux-build-module-wheels.sh

@@ -9,7 +9,7 @@
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux1-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/dockcross-manylinux-build-wheels.sh

@@ -8,7 +8,7 @@
 #   scripts/dockcross-manylinux-build-wheels.sh cp35
 
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux1-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

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

@@ -25,8 +25,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
     version=$(basename $(dirname ${PYBIN}))
     # Remove "m" -- not present in Python 3.8 and later
     version=${version:0:9}
-    itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux1_${ARCH})
-    ln -fs /ITKPythonPackage/ITK-${version}*-manylinux1_${ARCH} $itk_build_dir
+    itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH})
+    ln -fs /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH} $itk_build_dir
     if [[ ! -d ${itk_build_dir} ]]; then
       echo 'ITK build tree not available!' 1>&2
       exit 1
@@ -51,7 +51,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
 done
 
 # Since there are no external shared libraries to bundle into the wheels
-# this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
+# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
 for whl in dist/*linux_$(uname -p).whl; do
     auditwheel repair ${whl} -w /work/dist/
     rm ${whl}

scripts/internal/manylinux-build-wheels.sh

@@ -38,10 +38,10 @@ for PYBIN in "${PYBINARIES[@]}"; do
     # Install dependencies
     ${PYBIN}/pip install --upgrade -r /work/requirements-dev.txt
 
-    build_type=""
-    compile_flags="-O2 -DNDEBUG"
+    build_type="Release"
+    compile_flags="-O3 -DNDEBUG"
     source_path=/work/ITK-source/ITK
-    build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH}
+    build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux2014_${ARCH}
     SETUP_PY_CONFIGURE="${script_dir}/../setup_py_configure.py"
     SKBUILD_CMAKE_INSTALL_PREFIX=$(${Python3_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
 
@@ -64,6 +64,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
             -DITKPythonPackage_WHEEL_NAME:STRING="itk" \
             -DITK_WRAP_unsigned_short:BOOL=ON \
             -DITK_WRAP_double:BOOL=ON \
+            -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
             -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
             -DCMAKE_CXX_FLAGS:STRING="$compile_flags" \
             -DCMAKE_C_FLAGS:STRING="$compile_flags" \
@@ -100,6 +101,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DITK_WRAP_double:BOOL=ON \
+          -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
           -DPY_SITE_PACKAGES_PATH:PATH="." \
           -DITK_LEGACY_SILENT:BOOL=ON \
           -DITK_WRAP_PYTHON:BOOL=ON \
@@ -123,6 +125,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DITK_WRAP_double:BOOL=ON \
+          -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
           -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
@@ -143,14 +146,15 @@ for PYBIN in "${PYBINARIES[@]}"; do
 
 done
 
-# auditwheel contains a regression where it will consume the "itk" wheels.
-/opt/python/cp37-cp37m/bin/pip3 install auditwheel==1.9.0 wheel==0.26.0
+/opt/python/cp37-cp37m/bin/pip3 install auditwheel wheel
 # Since there are no external shared libraries to bundle into the wheels
-# this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
-for whl in dist/*linux_$(uname -p).whl; do
-    /opt/python/cp37-cp37m/bin/auditwheel repair ${whl} -w /work/dist/
+# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
+for whl in dist/itk_*linux_$(uname -p).whl; do
+    /opt/python/cp37-cp37m/bin/auditwheel repair --plat manylinux2014_x86_64 ${whl} -w /work/dist/
     rm ${whl}
 done
+itk_wheel=$(ls dist/itk-*linux*)
+mv ${itk_wheel} ${itk_wheel/linux/manylinux2014}
 
 # Install packages and test
 for PYBIN in "${PYBINARIES[@]}"; do

scripts/macpython-build-wheels.sh

@@ -72,7 +72,7 @@ for VENV in "${VENVS[@]}"; do
     # Install dependencies
     ${Python3_EXECUTABLE} -m pip install --upgrade -r ${SCRIPT_DIR}/../requirements-dev.txt
 
-    build_type="MinSizeRel"
+    build_type="Release"
     plat_name="macosx-10.9-x86_64"
     osx_target="10.9"
     source_path=${SCRIPT_DIR}/../ITK-source/ITK
@@ -99,6 +99,7 @@ for VENV in "${VENVS[@]}"; do
         -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
         -DITK_WRAP_unsigned_short:BOOL=ON \
         -DITK_WRAP_double:BOOL=ON \
+        -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
         -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
         -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
         -DITK_WRAP_DOC:BOOL=ON
@@ -124,6 +125,7 @@ for VENV in "${VENVS[@]}"; do
           -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DITK_WRAP_double:BOOL=ON \
+          -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
           -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
@@ -152,6 +154,7 @@ for VENV in "${VENVS[@]}"; do
           -DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DITK_WRAP_double:BOOL=ON \
+          -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
           -DITK_WRAP_DOC:BOOL=ON \

scripts/windows_build_wheels.py

@@ -90,6 +90,7 @@ def build_wrapped_itk(
             "-DPython3_EXECUTABLE:FILEPATH=%s" % python_executable,
             "-DITK_WRAP_unsigned_short:BOOL=ON",
             "-DITK_WRAP_double:BOOL=ON",
+            "-DITK_WRAP_IMAGE_DIMS:STRING=2;3;4",
             "-DPython3_INCLUDE_DIR:PATH=%s" % python_include_dir,
             "-DPython3_INCLUDE_DIRS:PATH=%s" % python_include_dir,
             "-DPython3_LIBRARY:FILEPATH=%s" % python_library,