Skip to content

ENH: Update to ITK 5.3RC3 #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzenanz merged 4 commits into from
Apr 27, 2022
Merged

ENH: Update to ITK 5.3RC3 #142

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2c0f5d
ENH: Update to ITK 5.3RC3
dzenanz Feb 17, 2022
e8d743c
ENH: Update CI to 5.3RC3 and bump version number to 0.14.0
dzenanz Feb 17, 2022
192e607
ENH: Add humane warning for Python+RelWithDebInfo configuration
dzenanz Feb 18, 2022
188551d
ENH: Remove OpenCL packages from CI
dzenanz Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-18.04, windows-2019, macos-10.15]
os: [ubuntu-20.04, windows-2019, macos-10.15]
include:
- os: ubuntu-18.04
- os: ubuntu-20.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "v5.2.0"
itk-git-tag: "v5.3rc03"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "v5.2.0"
itk-git-tag: "v5.3rc03"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "v5.2.0"
itk-git-tag: "v5.3rc03"
cmake-build-type: "MinSizeRel"

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v2
Expand Down Expand Up @@ -135,9 +135,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: [36, 37, 38, 39]
python-version: [37, 38, 39, 310]
Comment thread
dzenanz marked this conversation as resolved.
include:
- itk-python-git-tag: "v5.2.0"
- itk-python-git-tag: "v5.3rc03"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.2.0"
- itk-python-git-tag: "v5.3rc03"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -207,9 +207,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version-minor: [6, 7, 8, 9]
python-version-minor: [7, 8, 9, 10]
include:
- itk-python-git-tag: "v5.2.0"
- itk-python-git-tag: "v5.3rc03"

steps:
- name: Get specific version of CMake, Ninja
Expand Down Expand Up @@ -254,13 +254,13 @@ jobs:
path: ../../im/dist

build-linux-opencl-python-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
max-parallel: 2
matrix:
python-version: [36, 37, 38, 39]
python-version: [37, 38, 39, 310]
include:
- itk-python-git-tag: "v5.2.0"
- itk-python-git-tag: "v5.3rc03"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.2.0"
- itk-python-git-tag: "v5.3rc03"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:
- build-linux-python-packages
- build-macos-python-packages
- build-windows-python-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: Download Python Packages
Expand All @@ -350,7 +350,7 @@ jobs:
needs:
- build-linux-opencl-python-packages
- build-macos-opencl-python-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: Download Python Packages
Expand Down
17 changes: 15 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.16.3)
project(Elastix)

# To ease enablement with Python packaging
Expand Down Expand Up @@ -40,7 +40,7 @@ set(_itk_build_testing ${BUILD_TESTING})
set(_itk_build_shared ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)
set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
set(elastix_GIT_TAG "3816950f157753ad3763cfe3988f49f788eb38c2")
set(elastix_GIT_TAG "a0cf5235691ab0e7416600ed29db5abf2ff8ffe2")
FetchContent_Declare(
elx
GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
Expand Down Expand Up @@ -80,6 +80,19 @@ set(BUILD_TESTING ${_itk_build_testing})
set(BUILD_SHARED_LIBS ${_itk_build_shared})


if(ITK_WRAP_PYTHON) # Python wrapping is enabled
get_property(multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(multi_config)
if(NOT (CMAKE_CONFIGURATION_TYPES STREQUAL "Release"))
message(WARNING "Python wrapping of ITKElastix is known not to work with RelWithDebInfo configuration. Release is recommended. Your CMAKE_CONFIGURATION_TYPES: ${CMAKE_CONFIGURATION_TYPES}")
endif()
else()
if(NOT (CMAKE_BUILD_TYPE STREQUAL "Release"))
message(WARNING "Python wrapping of ITKElastix is known not to work with RelWithDebInfo configuration. Release is recommended. Your CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
endif()
endif()

if(NOT ITK_SOURCE_DIR)
find_package(ITK REQUIRED)
list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name=package_name,
version='0.13.0',
version='0.14.0',
author='Insight Software Consortium',
author_email='itk+community@discourse.itk.org',
packages=['itk'],
Expand Down Expand Up @@ -49,6 +49,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.2.0'
r'itk>=5.3rc3'
]
)