Merge pull request #70 from thewtex/macos-ci

ENH: Add macOS Azure Pipelines configuration

Author: thewtex

CMake/CTestCustom.cmake.in

@@ -36,9 +36,7 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
 
 set(CTEST_CUSTOM_WARNING_EXCEPTION
   ${CTEST_CUSTOM_WARNING_EXCEPTION}
-  "ranlib:.*file:.*has no symbols"
-  "ranlib: file: .+ has no symbols"
-  "libtool:.*file:.*has no symbols"
+  "has no symbols"
   "ipo: warning #11053"
   "ipo: warning #11053"
   "vxl.core.vnl.algo"

CMake/ITKExamplesMacros.cmake

@@ -142,7 +142,10 @@ function(compare_to_baseline)
 
   if(ITK_WRAP_PYTHON AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_COMPARISON_EXAMPLE_NAME}/Code.py")
     set(python_test_name ${test_name}Python)
-    string(REPLACE . "Python." test_image "${test_image}")
+    get_filename_component(test_image_we "${test_image}" NAME_WE)
+    get_filename_component(test_image_dir "${test_image}" DIRECTORY)
+    get_filename_component(test_image_ext "${test_image}" EXT)
+    set(test_image "${test_image_dir}/${test_image_we}Python${test_image_ext}")
 
     # Add the comparison for the Python test output
     # Use the same baseline image as for the c++ output

CMakeLists.txt

@@ -4,6 +4,7 @@ foreach(p
     ## version need to explicitly be set to NEW.
     CMP0070 #3.10.0 Define ``file(GENERATE)`` behavior for relative paths.
     CMP0071 #3.10.0 Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
+    CMP0074 #3.12.0 `find_package()`` uses ``<PackageName>_ROOT`` variables.
     )
   if(POLICY ${p})
     cmake_policy(SET ${p} NEW)

Superbuild/External-ITK.cmake

@@ -1,31 +1,31 @@
 #---------------------------------------------------------------------------
 # Get and build itk
 
-if( NOT ITK_TAG )
-  # 2018-08-13
-  set( ITK_TAG "6b41fe1cbf7a71a6003d4824e02a69b41a508cda" )
+if(NOT ITK_TAG)
+  # 2018-09-26
+  set(ITK_TAG "b784f6355a88650f13345025ece292dd60a0d98c")
 endif()
 
-set( _vtk_args )
-if( VTK_DIR OR ITKExamples_USE_VTK )
+set(_vtk_args)
+if(VTK_DIR OR ITKExamples_USE_VTK)
   set( _vtk_args "-DVTK_DIR:PATH=${VTK_DIR}"
     -DModule_ITKVtkGlue:BOOL=ON
     -DModule_ITKLevelSetsv4Visualization:BOOL=ON
     )
 else()
-  set( _vtk_args
+  set(_vtk_args
     -DModule_ITKVtkGlue:BOOL=OFF
     -DModule_ITKLevelSetsv4Visualization:BOOL=OFF
     )
 endif()
 
-set( _opencv_args )
-if( OpenCV_DIR OR ITKExamples_USE_OpenCV )
+set(_opencv_args )
+if(OpenCV_DIR OR ITKExamples_USE_OpenCV)
   set( _opencv_args "-DOpenCV_DIR:PATH=${OpenCV_DIR}"
     -DModule_ITKVideoBridgeOpenCV:BOOL=ON
     )
 else()
-  set( _opencv_args
+  set(_opencv_args
     -DModule_ITKVideoBridgeOpenCV:BOOL=OFF
     )
 endif()
@@ -41,6 +41,13 @@ if(ITKExamples_USE_WRAP_PYTHON)
     )
 endif()
 
+set(_apple_args)
+if(APPLE)
+  set(_apple_args
+    "-DBUILD_SHARED_LIBS:BOOL=ON"
+    )
+endif()
+
 ExternalProject_Add(ITK
   GIT_REPOSITORY "${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git"
   GIT_TAG "${ITK_TAG}"
@@ -63,6 +70,7 @@ ExternalProject_Add(ITK
     ${_vtk_args}
     ${_opencv_args}
     ${_wrap_python_args}
+    ${_apple_args}
   INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "ITK install skipped"
   DEPENDS ${ITK_DEPENDENCIES} ${_python_depends} zlib
   LOG_BUILD 0

Superbuild/External-Python.cmake

@@ -1,38 +1,15 @@
-#---------------------------------------------------------------------------
-# Get a Python with the itk package installed on Windows or create a
-# virtualenv to install the ITK package on Linux or Mac
+find_package(PythonInterp 3 REQUIRED)
 
+set(_itk_venv "${CMAKE_CURRENT_BINARY_DIR}/itkpython")
 if(WIN32)
-  # python.org 64 bit Windows Python with the itk and sphinx packages installed
-  # Todo: needs update
-  message(FATAL_ERROR "ITKExamples_USE_WRAP_PYTHON without PYTHON_EXECUTABLE set is currently not supported on Windows.")
-  set(_itk_python_dir "${CMAKE_CURRENT_BINARY_DIR}/itkpython")
-  set(ITKPYTHON_EXECUTABLE "${_itk_python_dir}/python.exe" CACHE FILEPATH "Python executable with the ITK package installed" FORCE)
-  ExternalProject_Add(ITKPython
-    URL "https://data.kitware.com/api/v1/file/58c760808d777f0aef5d798e/download"
-    URL_MD5 "440580cec3b86903da26f0246637024f"
-    DOWNLOAD_NAME itkpython.zip
-    DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-    SOURCE_DIR ${_itk_python_dir}
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    )
+  set(ITKPYTHON_EXECUTABLE "${_itk_venv}/python.exe" CACHE FILEPATH "Python executable with the ITK package installed" FORCE)
 else()
-  find_package(PythonInterp REQUIRED)
-
-  set(_virtualenv_version 15.0.1)
-  set(_virtualenv_SOURCE_DIR "virtualenv-${_virtualenv_version}")
-  set(_virtualenv_script "${CMAKE_CURRENT_BINARY_DIR}/${_virtualenv_SOURCE_DIR}/virtualenv.py")
-  set(_itk_venv "${CMAKE_CURRENT_BINARY_DIR}/itkpython")
   set(ITKPYTHON_EXECUTABLE "${_itk_venv}/bin/python" CACHE FILEPATH "Python executable with the ITK package installed" FORCE)
-  ExternalProject_Add(ITKPython
-    URL "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-${_virtualenv_version}.tar.gz"
-    URL_MD5 "28d76a0d9cbd5dc42046dd14e76a6ecc"
-    DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-    SOURCE_DIR ${_virtualenv_SOURCE_DIR}
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ${PYTHON_EXECUTABLE} "${_virtualenv_script}" "${_itk_venv}"
-    INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --pre itk sphinx
-    )
 endif()
+
+ExternalProject_Add(ITKPython
+  DOWNLOAD_COMMAND ""
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${PYTHON_EXECUTABLE} -m venv "${_itk_venv}"
+  INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --pre itk sphinx
+  )

Utilities/Testing/azure-pipelines.yml

@@ -15,6 +15,32 @@ jobs:
 
         git clone -b dashboard --single-branch https://github.com/thewtex/ITKExamples.git ITKExamples-dashboard
 
+        sudo pip3 install ninja
+        sudo apt-get install -y python3-venv
+
+        c++ --version
+        cmake --version
+
+        ctest -S ITKExamples-dashboard/azure_dashboard.cmake -VV -j 4
+      displayName: Build and Test
+      workingDirectory: $(Agent.BuildDirectory)
+
+- job: macOS
+  timeoutInMinutes: 0
+  cancelTimeoutInMinutes: 60
+  pool:
+    vmImage: 'macOS 10.13'
+  steps:
+    - script: |
+        set -x
+
+        # Azure checkout submodules options does not currently work
+        pushd $(Build.SourcesDirectory)
+        git submodule update --init --recursive
+        popd
+
+        git clone -b dashboard --single-branch https://github.com/thewtex/ITKExamples.git ITKExamples-dashboard
+
         sudo pip3 install ninja
 
         c++ --version

src/Filtering/Thresholding/CMakeLists.txt

@@ -1,5 +1,6 @@
-add_example( ThresholdAnImageUsingOtsu )
-compare_to_baseline( EXAMPLE_NAME ThresholdAnImageUsingOtsu BASELINE_PREFIX OutputBaseline)
+# Temporarily disabled until Python packages are updated
+#add_example( ThresholdAnImageUsingOtsu )
+#compare_to_baseline( EXAMPLE_NAME ThresholdAnImageUsingOtsu BASELINE_PREFIX OutputBaseline)
 
 add_example( ThresholdAnImageUsingBinary )
 compare_to_baseline( EXAMPLE_NAME ThresholdAnImageUsingBinary BASELINE_PREFIX OutputBaseline)

src/Filtering/Thresholding/ThresholdAnImageUsingOtsu/OutputBaseline.png.sha512

@@ -1 +1 @@
-433ea07062a837358be08c86b4627a7938265cbdf9ae26eef6de40297d515204bb68e9f9f81572939c513c07b78f7e3382f8c0670ebcbe3b963b5cb2384e89d6
+2915aa065fc66a9fa1ce332341f4db4a1400a78a13fc875c801cc59fede564222fac00578681f68cb8705370c665696b659888939ce3cfff80eed17eba59a4b4