Fix Static/Jacobian dimension handling

Author: Valentin Boussot

.github/workflows/ElastixGitHubActions.yml

@@ -18,10 +18,6 @@ jobs:
             itk-git-tag: "v5.4.1"
             cmake-build-type: "Release"
             libs:
-              - libtorch/libtorch/lib/libc10.so
-              - libtorch/libtorch/lib/libgomp-98b21ff3.so.1
-              - libtorch/libtorch/lib/libtorch.so
-              - libtorch/libtorch/lib/libtorch_cpu.so
               - elastix-build/bin/libANNlib-5.2.so
               - elastix-build/bin/libANNlib-5.2.so.1
           - os: windows-2022
@@ -32,9 +28,6 @@ jobs:
             itk-git-tag: "v5.4.1"
             cmake-build-type: "Release"
             libs:
-              - libtorch/libtorch/lib/c10.dll
-              - libtorch/libtorch/lib/torch_cpu.dll
-              - libtorch/libtorch/lib/torch.dll
               - elastix-build/bin/ANNlib-5.2.dll
             vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
           - os: macos-13
@@ -45,9 +38,6 @@ jobs:
             itk-git-tag: "v5.4.1"
             cmake-build-type: "Release"
             libs:
-              - libtorch/libtorch/lib/libtorch.dylib
-              - libtorch/libtorch/lib/libc10.dylib
-              - libtorch/libtorch/lib/libtorch_cpu.dylib
               - elastix-build/bin/libANNlib-5.2.1.dylib
               - elastix-build/bin/libANNlib-5.2.dylib
     steps:

.github/workflows/ElastixPublish.yml

@@ -10,42 +10,72 @@ jobs:
       max-parallel: 3
       matrix:
         os: [ubuntu-22.04]
-        cuda-version: [cu118, cu126, cu128]
+        cuda-version: [cpu, cu126]
         include:
-          - cuda-version: cu118
+          - cuda-version: cpu
             os: ubuntu-22.04
-            cuda_toolkit_version: '11.8.0'
-            libtorch-cuda-url: https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.7.0%2Bcu118.zip
+            artifact-version: "linux-libtorch-shared-with-deps-2.8.0-cpu"
+            libtorch-cuda-url: https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-2.8.0%2Bcpu.zip
             itk-git-tag: "v5.4.1"
             c-compiler: "gcc"
             cxx-compiler: "g++"
             cmake-build-type: "Release"
             libs:
-              - elastix-build/bin/libANNlib-5.2.so
               - elastix-build/bin/libANNlib-5.2.so.1
+          - cuda-version: cpu
+            os: windows-2022
+            artifact-version: "win64-libtorch-shared-with-deps-2.8.0-cpu"
+            libtorch-cuda-url: https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-2.8.0%2Bcpu.zip
+            itk-git-tag: "v5.4.1"
+            c-compiler: "cl.exe"
+            cxx-compiler: "cl.exe"
+            cmake-build-type: "Release"
+            libs:
+              - elastix-build/bin/ANNlib-5.2.dll
+            vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
           - cuda-version: cu126
             os: ubuntu-22.04
-            cuda_toolkit_version: '12.6.1'
-            libtorch-cuda-url: https://download.pytorch.org/libtorch/cu126/libtorch-cxx11-abi-shared-with-deps-2.7.0%2Bcu126.zip
+            artifact-version: "linux-libtorch-shared-with-deps-2.8.0-cu126"
+            cuda_toolkit_version: '12.6.0'
+            libtorch-cuda-url: https://download.pytorch.org/libtorch/cu126/libtorch-shared-with-deps-2.8.0%2Bcu126.zip
             itk-git-tag: "v5.4.1"
             c-compiler: "gcc"
             cxx-compiler: "g++"
             cmake-build-type: "Release"
             libs:
-              - elastix-build/bin/libANNlib-5.2.so
               - elastix-build/bin/libANNlib-5.2.so.1
-          - cuda-version: cu128
-            os: ubuntu-22.04
-            cuda_toolkit_version: '12.8.1'
-            libtorch-cuda-url: https://download.pytorch.org/libtorch/cu128/libtorch-cxx11-abi-shared-with-deps-2.7.0%2Bcu128.zip
+          - cuda-version: cu126
+            os: windows-2022
+            artifact-version: "win64-libtorch-shared-with-deps-2.8.0-cu126"
+            cuda_toolkit_version: '12.6.0'
+            libtorch-cuda-url: https://download.pytorch.org/libtorch/cu126/libtorch-win-shared-with-deps-2.8.0%2Bcu126.zip
             itk-git-tag: "v5.4.1"
-            c-compiler: "gcc"
-            cxx-compiler: "g++"
+            c-compiler: "cl.exe"
+            cxx-compiler: "cl.exe"
             cmake-build-type: "Release"
             libs:
-              - elastix-build/bin/libANNlib-5.2.so
-              - elastix-build/bin/libANNlib-5.2.so.1
+              - elastix-build/bin/ANNlib-5.2.dll
+            vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
     steps:
+      - name: Free disk space
+        if: matrix.os != 'windows-2022'
+        run: |
+          echo "Disk before cleanup:"
+          df -h
+
+          sudo rm -rf /usr/share/dotnet \
+                      /usr/local/lib/android \
+                      /opt/ghc \
+                      /opt/hostedtoolcache
+
+          sudo docker system prune -af || true
+
+          sudo rm -rf /var/lib/apt/lists/*
+
+          echo "Disk after cleanup:"
+          df -h
+        shell: bash
+
       - name: Clone elastix
         uses: actions/checkout@v3
 
@@ -73,12 +103,26 @@ jobs:
           cmake-build-type: ${{ matrix.cmake-build-type }}
           vcvars: ${{ matrix.vcvars64 }}
 
-      - uses: Jimver/[email protected]
-        id: cuda-toolkit
+      - name: Install CUDA Toolkit (Ubuntu)
+        uses: Jimver/[email protected]
+        if: matrix.cuda-version != 'cpu' && !startsWith(matrix.os, 'windows')
+        id: cuda-toolkit-Ubuntu
         with:
           cuda: ${{ matrix.cuda_toolkit_version }}
           sub-packages: '["toolkit"]'
           method: 'network'
+          log-file-suffix: '${{ matrix.os }}-${{ matrix.cuda-version }}.txt'
+
+      - name: Install CUDA Toolkit (Windows)
+        uses: Jimver/[email protected]
+        if: matrix.cuda-version != 'cpu' && startsWith(matrix.os, 'windows')
+        id: cuda-toolkit-Windows
+        with:
+          cuda: ${{ matrix.cuda_toolkit_version }}
+          method: local
+          log-file-suffix: 'windows-2022-cu126'
+          use-github-cache: true
+          use-local-cache: true
 
       - name: Build elastix
         uses: ./.github/actions/build_elastix
@@ -92,6 +136,6 @@ jobs:
         uses: ./.github/actions/publish
         with:
           libs: ${{ join(matrix.libs, ' ') }}
-          upload-name: ${{ matrix.os }}-${{ matrix.cuda-version }}
+          upload-name: elastix-impact-5.2.0-${{ matrix.artifact-version }}
           docker-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           docker-password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

Components/Metrics/Impact/elxImpactMetric.hxx

@@ -114,21 +114,12 @@ ImpactMetric<TElastix>::GenerateModelsConfiguration(unsigned int level,
   }
 
   /** Get and set the voxel size. */
-  std::string               patchSizeStr;
   std::vector<unsigned int> dimensions;
   unsigned int              num = 0;
   for (unsigned int dimension : modelsDimensionVec)
   {
-    if (mode == "Static")
-    {
-      num += dimension;
-      dimensions.push_back(dimension);
-    }
-    else
-    {
-      num += imageDimension;
-      dimensions.push_back(imageDimension);
-    }
+    num += dimension;
+    dimensions.push_back(dimension);
   }
 
   std::vector<unsigned int> patchSizeVec(num, 5);