Merge pull request #102 from InsightSoftwareConsortium/elastix-bump

InsightSoftwareConsortium · Feb 20, 2021 · 314df2f · 314df2f
2 parents 685f393 + 4045f0c
commit 314df2f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -13,17 +13,17 @@ jobs:
           - os: ubuntu-18.04
             c-compiler: "gcc"
             cxx-compiler: "g++"
-            itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
+            itk-git-tag: "v5.2rc02"
             cmake-build-type: "MinSizeRel"
           - os: windows-2019
             c-compiler: "cl.exe"
             cxx-compiler: "cl.exe"
-            itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
+            itk-git-tag: "v5.2rc02"
             cmake-build-type: "Release"
           - os: macos-10.15
             c-compiler: "clang"
             cxx-compiler: "clang++"
-            itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
+            itk-git-tag: "v5.2rc02"
             cmake-build-type: "MinSizeRel"
 
     steps:
@@ -137,7 +137,7 @@ jobs:
       matrix:
         python-version: [36, 37, 38, 39]
         include:
-          - itk-python-git-tag: "v5.2rc01"
+          - itk-python-git-tag: "v5.2rc02"
 
     steps:
     - uses: actions/checkout@v2
@@ -173,7 +173,7 @@ jobs:
       max-parallel: 2
       matrix:
         include:
-          - itk-python-git-tag: "v5.2rc01"
+          - itk-python-git-tag: "v5.2rc02"
 
     steps:
     - uses: actions/checkout@v2
@@ -209,7 +209,7 @@ jobs:
       matrix:
         python-version-minor: [6, 7, 8, 9]
         include:
-          - itk-python-git-tag: "v5.2rc01"
+          - itk-python-git-tag: "v5.2rc02"
 
     steps:
     - name: Get specific version of CMake, Ninja
@@ -258,9 +258,9 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: [36, 37, 38]
+        python-version: [36, 37, 38, 39]
         include:
-          - itk-python-git-tag: "v5.1.2"
+          - itk-python-git-tag: "v5.2rc02"
 
     steps:
     - uses: actions/checkout@v2
@@ -292,7 +292,7 @@ jobs:
       max-parallel: 2
       matrix:
         include:
-          - itk-python-git-tag: "v5.1.2"
+          - itk-python-git-tag: "v5.2rc02"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,8 +39,8 @@ set(_itk_build_testing ${BUILD_TESTING})
 #set(BUILD_TESTING OFF)
 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 "e72d2b690d0a0d869ec89cb9bd444a450d21bf88")
+set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git")
+set(elastix_GIT_TAG "c9cc5a438a8ced28e61b46994e75e57843422cfb")
 FetchContent_Declare(
   elx
   GIT_REPOSITORY ${elastix_GIT_REPOSITORY}

diff --git a/binder/requirements.txt b/binder/requirements.txt
@@ -1,10 +1,10 @@
-itk-elastix>=0.8.0
-itk>=5.1.1
-itk-core>=5.1.1
-itk-numerics>=5.1.1
-itk-filtering>=5.1.1
-itk-registration>=5.1.1
-itk-segmentation>=5.1.1
+itk-elastix>=0.10.0
+itk>=5.2rc2
+itk-core>=5.2rc2
+itk-numerics>=5.2rc2
+itk-filtering>=5.2rc2
+itk-registration>=5.2rc2
+itk-segmentation>=5.2rc2
 itkwidgets>=0.32.0
 jupyterlab>=2.2.0
 imageio

diff --git a/setup.py b/setup.py
@@ -49,6 +49,6 @@
     keywords='ITK InsightToolkit',
     url=r'https://itk.org/',
     install_requires=[
-        r'itk>=5.2rc1'
+        r'itk>=5.2rc2'
     ]
     )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -8,6 +8,7 @@ CreateTestDriver(Elastix "${Elastix-Test_LIBRARIES}" "${ElastixTests}")
 
 itk_add_test(NAME itkElastixRegistrationMethodTest
   COMMAND ElastixTestDriver
+  --compareNumberOfPixelsTolerance 25
   --compare
     ${ITK_TEST_OUTPUT_DIR}/itkElastixRegistrationMethodTestOutput.mha
     DATA{Baseline/itkElastixRegistrationMethodTestOutput.mha}

diff --git a/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh b/wrapping/dockcross-manylinux-build-module-wheels-opencl.sh
@@ -6,10 +6,10 @@
 # Versions can be restricted by passing them in as arguments to the script
 # For example,
 #
-#   scripts/dockcross-manylinux-build-module-wheels.sh cp27mu cp35
+#   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
@@ -35,7 +35,7 @@ fi
 
 # Build wheels
 mkdir -p dist
-DOCKER_ARGS="-e ELASTIX_USE_OPENCL=1 -v $(pwd)/dist:/work/dist/ -v $(pwd)/ITKPythonPackage:/ITKPythonPackage -v $(pwd)/tools:/tools -v $(pwd)/OpenCL-ICD-Loader/inc/CL:/usr/include/CL -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so.1 -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so"
+DOCKER_ARGS="-e ELASTIX_USE_OPENCL=1 -v $(pwd)/dist:/work/dist/ -v $script_dir/../ITKPythonPackage:/ITKPythonPackage -v $(pwd)/tools:/tools -v $(pwd)/OpenCL-ICD-Loader/inc/CL:/usr/include/CL -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so.1 -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so"
 /tmp/dockcross-manylinux-x64 \
   -a "$DOCKER_ARGS" \
   "/ITKPythonPackage/scripts/internal/manylinux-build-module-wheels.sh" "$@"