Merge branch 'mac-arm-disable-tbb'

Author: thewtex

CMakeLists.txt

@@ -89,8 +89,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
- # ITK nightly-master 2022-07-25
-  set(ITK_GIT_TAG "8454e9da2d")
+ # ITK nightly-master 2022-07-27
+  set(ITK_GIT_TAG "fb3bc5d9799b3e0ff86505413c2d58c56fd97aac")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused

scripts/macpython-build-tarball.sh

@@ -4,15 +4,17 @@
 # downloaded by the external module build scripts and used to build their
 # Python package on GitHub CI services.
 
+tbb_contents="ITKPythonPackage/oneTBB*"
 arch_postfix=""
 if test $(arch) == "arm64"; then
   arch_postfix="-arm64"
+  tbb_contents=""
 fi
 
 pushd /Users/svc-dashboard/D/P > /dev/null
 tar -cf ITKPythonBuilds-macosx${arch_postfix}.tar \
   ITKPythonPackage/ITK-* \
-  ITKPythonPackage/oneTBB* \
+  ${tbb_contents} \
   ITKPythonPackage/venvs \
   ITKPythonPackageRequiredExtractionDir.txt \
   ITKPythonPackage/scripts

scripts/macpython-build-wheels.sh

@@ -50,13 +50,19 @@ DELOCATE_LISTDEPS=${VENV}/bin/delocate-listdeps
 DELOCATE_WHEEL=${VENV}/bin/delocate-wheel
 DELOCATE_PATCH=${VENV}/bin/delocate-patch
 
+if [[ $(arch) == "arm64" ]]; then
+  use_tbb="OFF"
+else
+  use_tbb="ON"
+fi
 # Build standalone project and populate archive cache
 tbb_dir=$PWD/oneTBB-prefix/lib/cmake/TBB
 # So delocate can find the libs
 export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:$PWD/oneTBB-prefix/lib
 mkdir -p ITK-source
 pushd ITK-source > /dev/null 2>&1
   ${CMAKE_EXECUTABLE} -DITKPythonPackage_BUILD_PYTHON:PATH=0 \
+    -DITKPythonPackage_USE_TBB:BOOL=${use_tbb} \
     -G Ninja \
     -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
       ${SCRIPT_DIR}/../
@@ -116,7 +122,7 @@ for VENV in "${VENVS[@]}"; do
         -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
         -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
         -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
-        -DModule_ITKTBB:BOOL=ON \
+        -DModule_ITKTBB:BOOL=${use_tbb} \
         -DTBB_DIR:PATH=${tbb_dir} \
         -DITK_WRAP_DOC:BOOL=ON \
         ${CMAKE_OPTIONS}
@@ -152,7 +158,7 @@ for VENV in "${VENVS[@]}"; do
           -DITK_LEGACY_SILENT:BOOL=ON \
           -DITK_WRAP_PYTHON:BOOL=ON \
           -DITK_WRAP_DOC:BOOL=ON \
-          -DModule_ITKTBB:BOOL=ON \
+          -DModule_ITKTBB:BOOL=${use_tbb} \
           -DTBB_DIR:PATH=${tbb_dir} \
           ${CMAKE_OPTIONS} \
           -G Ninja \
@@ -171,6 +177,7 @@ for VENV in "${VENVS[@]}"; do
           -DITK_BINARY_DIR:PATH=${build_path} \
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
           -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
+          -DITKPythonPackage_USE_TBB:BOOL=${use_tbb} \
           -DITKPythonPackage_ITK_BINARY_REUSE:BOOL=ON \
           -DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
           -DITK_WRAP_unsigned_short:BOOL=ON \