From 4b29f86673a08d55a8dbf5b2398970f95168bfd1 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 25 Feb 2020 17:43:28 -0500 Subject: [PATCH 01/11] ENH: CI builds against ITK 5.1 RC 2 --- test/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/azure-pipelines.yml b/test/azure-pipelines.yml index 9fdeafc0..7931141f 100644 --- a/test/azure-pipelines.yml +++ b/test/azure-pipelines.yml @@ -1,6 +1,6 @@ variables: - ITKGitTag: v5.1rc01 - ITKPythonGitTag: v5.1rc01 + ITKGitTag: v5.1rc02 + ITKPythonGitTag: v5.1rc02 CMakeBuildType: Release trigger: From e34ca885a977ba268cd033de2e155a9558ac5105 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 5 Mar 2020 22:40:17 -0500 Subject: [PATCH 02/11] DOC: Update Copyright assignment to NumFOCUS --- include/itkElastixRegistrationMethod.h | 2 +- include/itkElastixRegistrationMethod.hxx | 2 +- include/itkTransformixFilter.h | 2 +- include/itkTransformixFilter.hxx | 2 +- test/itkElastixRegistrationMethodTest.cxx | 2 +- wrapping/test/itkElastixRegistrationMethodTest.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/itkElastixRegistrationMethod.h b/include/itkElastixRegistrationMethod.h index fd9c51fb..7363a452 100644 --- a/include/itkElastixRegistrationMethod.h +++ b/include/itkElastixRegistrationMethod.h @@ -1,6 +1,6 @@ /*========================================================================= * - * Copyright Insight Software Consortium + * Copyright NumFOCUS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/itkElastixRegistrationMethod.hxx b/include/itkElastixRegistrationMethod.hxx index 3c46fa0c..c7871467 100644 --- a/include/itkElastixRegistrationMethod.hxx +++ b/include/itkElastixRegistrationMethod.hxx @@ -1,6 +1,6 @@ /*========================================================================= * - * Copyright Insight Software Consortium + * Copyright NumFOCUS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/itkTransformixFilter.h b/include/itkTransformixFilter.h index a0551e30..30f0eedc 100644 --- a/include/itkTransformixFilter.h +++ b/include/itkTransformixFilter.h @@ -1,6 +1,6 @@ /*========================================================================= * - * Copyright Insight Software Consortium + * Copyright NumFOCUS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/itkTransformixFilter.hxx b/include/itkTransformixFilter.hxx index 338c8257..263c7a33 100644 --- a/include/itkTransformixFilter.hxx +++ b/include/itkTransformixFilter.hxx @@ -1,6 +1,6 @@ /*========================================================================= * - * Copyright Insight Software Consortium + * Copyright NumFOCUS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/itkElastixRegistrationMethodTest.cxx b/test/itkElastixRegistrationMethodTest.cxx index fd4f637c..083ce26d 100644 --- a/test/itkElastixRegistrationMethodTest.cxx +++ b/test/itkElastixRegistrationMethodTest.cxx @@ -1,6 +1,6 @@ /*========================================================================= * - * Copyright Insight Software Consortium + * Copyright NumFOCUS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wrapping/test/itkElastixRegistrationMethodTest.py b/wrapping/test/itkElastixRegistrationMethodTest.py index 15d26814..9c772b89 100644 --- a/wrapping/test/itkElastixRegistrationMethodTest.py +++ b/wrapping/test/itkElastixRegistrationMethodTest.py @@ -1,6 +1,6 @@ #========================================================================== # -# Copyright Insight Software Consortium +# Copyright NumFOCUS # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 4bd5b2a0384903a0c15ef1932f9d08721ea24e40 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 1 Apr 2020 21:37:31 -0400 Subject: [PATCH 03/11] ENH: CI builds against ITK 5.1 RC 3 --- test/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/azure-pipelines.yml b/test/azure-pipelines.yml index 7931141f..1ec9a384 100644 --- a/test/azure-pipelines.yml +++ b/test/azure-pipelines.yml @@ -1,6 +1,6 @@ variables: - ITKGitTag: v5.1rc02 - ITKPythonGitTag: v5.1rc02 + ITKGitTag: v5.1rc03 + ITKPythonGitTag: v5.1rc03 CMakeBuildType: Release trigger: From 1e1daec42cfcd05630c94a3b2575667f48c1b58c Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 3 Mar 2020 17:43:53 -0500 Subject: [PATCH 04/11] COMP: Update elastix commit for ITK 5.1 RC 3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0510e30c..6beac942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(BUILD_TESTING OFF) set(_itk_build_shared ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") -set(elastix_GIT_TAG "9de795ed53f85a05f188c11beed1b251d459e201") +set(elastix_GIT_TAG "a6ad13c70c670d0d4ae67af3fe4fd28ddc36a352") FetchContent_Declare( elastix_fetch GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 46d0c3a8cf0a43571f99e61686a7dbe782fa06ae Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 3 Apr 2020 09:47:18 -0400 Subject: [PATCH 05/11] ENH: Update CI Virtual Machine images --- test/azure-pipelines.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/azure-pipelines.yml b/test/azure-pipelines.yml index 1ec9a384..b4dbdd06 100644 --- a/test/azure-pipelines.yml +++ b/test/azure-pipelines.yml @@ -19,20 +19,20 @@ jobs: strategy: matrix: Linux: - imageName: 'ubuntu-16.04' + imageName: 'ubuntu-18.04' cCompiler: gcc cxxCompiler: g++ compilerInitialization: '' macOS: - imageName: 'macos-10.13' + imageName: 'macos-10.15' cCompiler: clang cxxCompiler: clang++ compilerInitialization: '' Windows: - imageName: 'vs2017-win2016' + imageName: 'windows-2019' cCompiler: cl.exe cxxCompiler: cl.exe - compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"' + compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"' pool: vmImage: $(imageName) @@ -150,7 +150,7 @@ jobs: cancelTimeoutInMinutes: 300 displayName: "Build Linux Python packages" pool: - vmImage: 'Ubuntu-16.04' + vmImage: 'Ubuntu-18.04' steps: - script: | @@ -174,7 +174,7 @@ jobs: timeoutInMinutes: 0 cancelTimeoutInMinutes: 300 pool: - vmImage: 'macos-10.14' + vmImage: 'macos-10.15' steps: - script: | @@ -198,7 +198,7 @@ jobs: timeoutInMinutes: 0 cancelTimeoutInMinutes: 300 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | @@ -206,7 +206,7 @@ jobs: displayName: 'Fetch build script' - script: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set ITK_PACKAGE_VERSION=$(ITKPythonGitTag) set CC=cl.exe set CXX=cl.exe @@ -224,7 +224,7 @@ jobs: cancelTimeoutInMinutes: 300 displayName: "Build Linux Python OpenCL packages" pool: - vmImage: 'Ubuntu-16.04' + vmImage: 'Ubuntu-18.04' steps: - script: | @@ -243,7 +243,7 @@ jobs: cancelTimeoutInMinutes: 300 displayName: "Build macOS Python OpenCL packages" pool: - vmImage: 'macos-10.14' + vmImage: 'macos-10.15' steps: - script: | From 61c83f47194e4a346541e291d2bef682be6d0cf3 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 27 Apr 2020 14:53:33 -0400 Subject: [PATCH 06/11] ENH: CI builds against ITK 5.1.0 --- test/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/azure-pipelines.yml b/test/azure-pipelines.yml index b4dbdd06..72cda462 100644 --- a/test/azure-pipelines.yml +++ b/test/azure-pipelines.yml @@ -1,6 +1,6 @@ variables: - ITKGitTag: v5.1rc03 - ITKPythonGitTag: v5.1rc03 + ITKGitTag: v5.1.0 + ITKPythonGitTag: v5.1.0 CMakeBuildType: Release trigger: From c31d82dc27985eb2a6bac7eafbc1ef6767be100e Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 29 Apr 2020 14:08:57 -0400 Subject: [PATCH 07/11] COMP: Update elastix commit for ITK 5.1.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6beac942..31b0e443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(BUILD_TESTING OFF) set(_itk_build_shared ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") -set(elastix_GIT_TAG "a6ad13c70c670d0d4ae67af3fe4fd28ddc36a352") +set(elastix_GIT_TAG "67bc5bd7e5358193c373947f0e8713bd6a1f90b1") FetchContent_Declare( elastix_fetch GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 43506eda0729dd460dc3c3d25133123f9b7e171f Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 29 Apr 2020 15:04:43 -0400 Subject: [PATCH 08/11] ENH: Update OpenCL Linux Python package scripts for ITK 5.1.0 --- wrapping/dockcross-manylinux-build-module-wheels-opencl.sh | 5 +---- wrapping/dockcross-manylinux-download-cache.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh b/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh index 54748425..fe793c65 100755 --- a/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh +++ b/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh @@ -8,11 +8,8 @@ # # scripts/dockcross-manylinux-build-module-wheels.sh cp27mu cp35 -# Pull dockcross manylinux images -docker pull dockcross/manylinux-x64 - # Generate dockcross scripts -docker run dockcross/manylinux-x64 > /tmp/dockcross-manylinux-x64 +docker run --rm dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64 chmod u+x /tmp/dockcross-manylinux-x64 script_dir=$(cd $(dirname $0) || exit 1; pwd) diff --git a/wrapping/dockcross-manylinux-download-cache.sh b/wrapping/dockcross-manylinux-download-cache.sh index 876365d2..bd584683 100755 --- a/wrapping/dockcross-manylinux-download-cache.sh +++ b/wrapping/dockcross-manylinux-download-cache.sh @@ -7,7 +7,7 @@ curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o z gunzip -d zstd-1.2.0-linux.tar.gz tar xf zstd-1.2.0-linux.tar -curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0.1}/ITKPythonBuilds-linux.tar.zst -O +curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.1.0}/ITKPythonBuilds-linux.tar.zst -O ./zstd-1.2.0-linux/bin/unzstd ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar tar xf ITKPythonBuilds-linux.tar From d0b6c25a80def6bd933d27c382a8fb482e30b125 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 29 Apr 2020 15:54:31 -0400 Subject: [PATCH 09/11] COMP: Elastix build error with GCC 4.8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31b0e443..54264c56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(BUILD_TESTING OFF) set(_itk_build_shared ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") -set(elastix_GIT_TAG "67bc5bd7e5358193c373947f0e8713bd6a1f90b1") +set(elastix_GIT_TAG "80988d36ead7dcdaaf31fc3632c29942c4c990a8") FetchContent_Declare( elastix_fetch GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From facd9b5f74fd9e8a353f810a44c0ec397ae235dd Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 29 Apr 2020 20:35:16 -0400 Subject: [PATCH 10/11] COMP: Address OpenCL TimeStampFormat ITK 5.1 typed enum compile error --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54264c56..185142c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(BUILD_TESTING OFF) set(_itk_build_shared ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") -set(elastix_GIT_TAG "80988d36ead7dcdaaf31fc3632c29942c4c990a8") +set(elastix_GIT_TAG "a13be5c2daa1d2b8454609366aef3cba194be8c2") FetchContent_Declare( elastix_fetch GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 95053e73f115ec2a636e118c8ba27c498022798f Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 29 Apr 2020 21:00:11 -0400 Subject: [PATCH 11/11] ENH: Bump Python package version to 0.6.0 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3d452c2d..6db31e0f 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name=package_name, - version='0.5.1', + version='0.6.0', author='Insight Software Consortium', author_email='itk+community@discourse.itk.org', packages=['itk'], @@ -49,6 +49,6 @@ keywords='ITK InsightToolkit', url=r'https://itk.org/', install_requires=[ - r'itk>=5.1rc1' + r'itk>=5.1.0' ] )