ENH: Add TBB support to Linux wheels

Author: thewtex

.gitignore

@@ -42,6 +42,7 @@ develop-eggs
 lib
 lib64
 MANIFEST
+oneTBB-prefix/
 
 # Installer logs
 pip-log.txt

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
 
 project(ITKPythonPackage CXX)
 
@@ -14,6 +14,8 @@ if(NOT DEFINED ITKPythonPackage_WHEEL_NAME)
 endif()
 message(STATUS "SuperBuild - ITKPythonPackage_WHEEL_NAME:${ITKPythonPackage_WHEEL_NAME}")
 
+option(ITKPythonPackage_USE_TBB "Build and use oneTBB in the ITK python package" ON)
+
 if(ITKPythonPackage_SUPERBUILD)
 
   #-----------------------------------------------------------------------------
@@ -44,8 +46,8 @@ if(ITKPythonPackage_SUPERBUILD)
   #  ITK_SOURCE_DIR: Path to an existing source directory
   #
 
-  option ( ITKPythonPackage_BUILD_PYTHON "Build ITK python module" ON )
-  mark_as_advanced( ITKPythonPackage_BUILD_PYTHON )
+  option(ITKPythonPackage_BUILD_PYTHON "Build ITK python module" ON)
+  mark_as_advanced(ITKPythonPackage_BUILD_PYTHON)
 
   if(CMAKE_OSX_DEPLOYMENT_TARGET)
     list(APPEND ep_common_cmake_cache_args
@@ -89,6 +91,39 @@ if(ITKPythonPackage_SUPERBUILD)
     message(FATAL_ERROR "ITK_SOURCE_DIR variable is defined but corresponds to nonexistent directory")
   endif()
 
+  set(tbb_args )
+  if(ITKPythonPackage_USE_TBB)
+    ExternalProject_add(oneTBB
+      GIT_REPOSITORY "https://github.com/oneapi-src/oneTBB.git"
+      GIT_TAG "v2021.3.0"
+      CMAKE_ARGS
+        -DTBB_TEST:BOOL=OFF
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/../oneTBB-prefix
+        ${ep_common_cmake_cache_args}
+      USES_TERMINAL_DOWNLOAD 1
+      USES_TERMINAL_UPDATE 1
+      USES_TERMINAL_CONFIGURE 1
+      USES_TERMINAL_BUILD 1
+      )
+    if(ITK_SOURCE_DIR)
+      set(TBB_DIR "${ITK_SOURCE_DIR}/../oneTBB-prefix/lib64/cmake/TBB")
+    else()
+      set(TBB_DIR "${CMAKE_BINARY_DIR}/../oneTBB-prefix/lib64/cmake/TBB")
+    endif()
+    set(tbb_args
+      -DModule_ITKTBB:BOOL=ON
+      -DTBB_DIR:PATH=${TBB_DIR}
+    )
+    message(STATUS "SuperBuild -   TBB: Enabled")
+    message(STATUS "SuperBuild -   TBB_DIR: ${TBB_DIR}")
+  endif()
+  set(tbb_depends "")
+  if(ITKPythonPackage_USE_TBB)
+    set(tbb_depends oneTBB)
+  endif()
+
+
   if(NOT DEFINED ITK_SOURCE_DIR)
 
     set(ITK_SOURCE_DIR ${CMAKE_BINARY_DIR}/ITK)
@@ -101,6 +136,7 @@ if(ITKPythonPackage_SUPERBUILD)
       CONFIGURE_COMMAND ""
       BUILD_COMMAND ""
       INSTALL_COMMAND ""
+      DEPENDS ${tbb_depends}
       )
     set(proj_status "")
 
@@ -234,6 +270,7 @@ if(ITKPythonPackage_SUPERBUILD)
         -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE}
         ${ep_common_cmake_cache_args}
         ${ep_itk_cmake_cache_args}
+        ${tbb_args}
       USES_TERMINAL_DOWNLOAD 1
       USES_TERMINAL_UPDATE 1
       USES_TERMINAL_CONFIGURE 1

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/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux2014-x64:20210823-d7b98b4 > /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

@@ -5,10 +5,10 @@
 # Versions can be restricted by passing them in as arguments to the script
 # For example,
 #
-#   scripts/dockcross-manylinux-build-wheels.sh cp35
+#   scripts/dockcross-manylinux-build-wheels.sh cp39
 
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux2014-x64:20210823-d7b98b4 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/internal/manylinux-build-wheels.sh

@@ -18,6 +18,9 @@ pushd /work/ITK-source > /dev/null 2>&1
   cmake -DITKPythonPackage_BUILD_PYTHON:PATH=0 -G Ninja ../
   ninja
 popd > /dev/null 2>&1
+tbb_dir=/work/oneTBB-prefix/lib64/cmake/TBB
+# So auditwheel can find the libs
+export LD_LIBRARY_PATH=/work/oneTBB-prefix/lib64
 
 SINGLE_WHEEL=0
 
@@ -67,6 +70,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
             -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
             -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
             -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
+            -DModule_ITKTBB:BOOL=ON \
+            -DTBB_DIR:PATH=${tbb_dir} \
             -DITK_WRAP_DOC:BOOL=ON
       # Cleanup
       ${PYBIN}/python setup.py clean
@@ -102,6 +107,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DITK_LEGACY_SILENT:BOOL=ON \
           -DITK_WRAP_PYTHON:BOOL=ON \
           -DITK_WRAP_DOC:BOOL=ON \
+          -DModule_ITKTBB:BOOL=ON \
+          -DTBB_DIR:PATH=${tbb_dir} \
           -G Ninja \
           ${source_path} \
         && ninja \
@@ -143,8 +150,7 @@ done
 
 if test "${ARCH}" == "x64"; then
   /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 'manylinux2014' tag
+  # 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}